From 942672c4ad6d2ae95198a8da5b986b0d5ee637ad Mon Sep 17 00:00:00 2001 From: danny Date: Mon, 20 Jul 2026 18:35:23 +0200 Subject: [PATCH] =?UTF-8?q?CR=2014+15:=20Aula=20gebaut,=20Schlafsaal-T?= =?UTF-8?q?=C3=BCr=20raus,=20Hub-Layout=20nach=20ORTE.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Neue Greybox-Aula (scenes/hub/aula.tscn): Tisch-/Bankreihen, Essensausgabe mit Küche (Dampf-Partikel, Warmlicht), Minispiel-Ecke (Heimat für CR 13), Imogen/Wren/Ridoc + vier „Graue" - Anbindung: Hof-Tür „Zur Aula" (room_id aula) + Rückweg + Spawns; Aula in allen zehn Tagesplänen offen, wo auch der Hof offen ist — Tag-9-Nachmittag bleibt exklusiv beim Materialraum - Verwaiste Klassenraum-Tür samt Spawn-Marker aus dem Schlafsaal entfernt - Hub-Tore nach ORTE.md gruppiert: Lehrtrakt + Rotunde + Aula an der Westwand, Schlafsaal/Wohntrakt/Materialraum Ost, Gauntlet- und Tal-Tor Süd, neues Parapet-Tor als Kulisse; Spawn-Marker und Eskorte-Ziel mitgezogen, verwaiste Marker entfernt - Namens-Setzung: Deveras Raum heißt „Hörsaal" (Label, Codex, Lexicon), die Aula ist der Ess-/Sozialsaal - Buchführung: CR 14+15 nach CHANGEREQUESTS_DONE, ROADMAP nachgezogen — Welle 1 damit vollständig Co-Authored-By: Claude Fable 5 --- data/lexicon/subjects.json | 2 +- data/story/codex.json | 2 +- data/story/days/day_01.json | 6 +- data/story/days/day_02.json | 6 +- data/story/days/day_03.json | 6 +- data/story/days/day_04.json | 6 +- data/story/days/day_05.json | 6 +- data/story/days/day_06.json | 6 +- data/story/days/day_07.json | 6 +- data/story/days/day_08.json | 6 +- data/story/days/day_09.json | 4 +- data/story/days/day_10.json | 6 +- docs/CHANGEREQUESTS.md | 75 +----- docs/CHANGEREQUESTS_DONE.md | 48 ++++ docs/ROADMAP.md | 12 +- scenes/hub/aula.tscn | 454 +++++++++++++++++++++++++++++++++ scenes/hub/dormitory.tscn | 24 -- scenes/hub/rider_quadrant.tscn | 88 +++++-- 18 files changed, 616 insertions(+), 147 deletions(-) create mode 100644 scenes/hub/aula.tscn diff --git a/data/lexicon/subjects.json b/data/lexicon/subjects.json index d8abe7c..edc741e 100644 --- a/data/lexicon/subjects.json +++ b/data/lexicon/subjects.json @@ -24,7 +24,7 @@ "id": "battle_brief", "title": "Gefechtskunde (Devera)", "counter_flag": "battle_brief_wissen", - "empty_line": "Noch keine Aufzeichnungen. Deveras Aula wartet — wer in der Gefechtskunde schläft, schläft bald für immer.", + "empty_line": "Noch keine Aufzeichnungen. Deveras Hörsaal wartet — wer in der Gefechtskunde schläft, schläft bald für immer.", "entries": [ { "min_count": 1, diff --git a/data/story/codex.json b/data/story/codex.json index 6a66899..e307bcc 100644 --- a/data/story/codex.json +++ b/data/story/codex.json @@ -13,7 +13,7 @@ { "id": "professoren", "title": "Die vier Professoren", - "body": "Emetterio führt die Sparringshalle — wer bei ihm besteht, wird härter und schneller. Devera hält die Gefechtskunde in der Aula: Karten, Frontverläufe, kalte Lagebilder. Kaori lehrt Drachenkunde in der Rotunde; ihr Wissen entscheidet beim Dreschen mit. Markham liest Geschichte — und lässt Lücken, wo die Einigung blutig war." + "body": "Emetterio führt die Sparringshalle — wer bei ihm besteht, wird härter und schneller. Devera hält die Gefechtskunde im Hörsaal: Karten, Frontverläufe, kalte Lagebilder. Kaori lehrt Drachenkunde in der Rotunde; ihr Wissen entscheidet beim Dreschen mit. Markham liest Geschichte — und lässt Lücken, wo die Einigung blutig war." }, { "id": "graue", diff --git a/data/story/days/day_01.json b/data/story/days/day_01.json index 8b1562d..0398e2c 100644 --- a/data/story/days/day_01.json +++ b/data/story/days/day_01.json @@ -5,17 +5,17 @@ "day_end_location": "imogen_room", "slots": { "morning": { - "rooms": ["courtyard", "rotunda", "sparring_hall"], + "rooms": ["courtyard", "aula", "rotunda", "sparring_hall"], "forced_scene": "violet_collapse_courtyard", "beat": "violet_schwaeche_klinge_herz_test" }, "afternoon": { - "rooms": ["courtyard", "rotunda", "sparring_hall"], + "rooms": ["courtyard", "aula", "rotunda", "sparring_hall"], "forced_scene": "", "beat": "cassian_hetzt_am_hofrand" }, "evening": { - "rooms": ["courtyard", "dormitory", "imogen_room"], + "rooms": ["courtyard", "aula", "dormitory", "imogen_room"], "forced_scene": "imogen_night_1", "beat": "imogen_erste_geheime_nacht" } diff --git a/data/story/days/day_02.json b/data/story/days/day_02.json index 76fcdaf..2467c6a 100644 --- a/data/story/days/day_02.json +++ b/data/story/days/day_02.json @@ -5,17 +5,17 @@ "day_end_location": "dormitory", "slots": { "morning": { - "rooms": ["courtyard", "sparring_hall", "rotunda"], + "rooms": ["courtyard", "aula", "sparring_hall", "rotunda"], "forced_scene": "", "beat": "unterricht_stats" }, "afternoon": { - "rooms": ["courtyard", "sparring_hall", "battle_brief"], + "rooms": ["courtyard", "aula", "sparring_hall", "battle_brief"], "forced_scene": "", "beat": "unterricht_stats" }, "evening": { - "rooms": ["courtyard", "dormitory"], + "rooms": ["courtyard", "aula", "dormitory"], "forced_scene": "", "beat": "maren_andeutung_vater" } diff --git a/data/story/days/day_03.json b/data/story/days/day_03.json index ed5ff61..3550009 100644 --- a/data/story/days/day_03.json +++ b/data/story/days/day_03.json @@ -5,17 +5,17 @@ "day_end_location": "imogen_room", "slots": { "morning": { - "rooms": ["courtyard", "sparring_hall", "rotunda"], + "rooms": ["courtyard", "aula", "sparring_hall", "rotunda"], "forced_scene": "", "beat": "unterricht_stats" }, "afternoon": { - "rooms": ["courtyard", "rotunda", "history_class"], + "rooms": ["courtyard", "aula", "rotunda", "history_class"], "forced_scene": "", "beat": "cassian_beobachtet_wren" }, "evening": { - "rooms": ["courtyard", "dormitory", "imogen_room"], + "rooms": ["courtyard", "aula", "dormitory", "imogen_room"], "forced_scene": "imogen_night_2", "beat": "imogen_verbirgt_etwas" } diff --git a/data/story/days/day_04.json b/data/story/days/day_04.json index 81674ad..b4b84c7 100644 --- a/data/story/days/day_04.json +++ b/data/story/days/day_04.json @@ -5,17 +5,17 @@ "day_end_location": "dormitory", "slots": { "morning": { - "rooms": ["courtyard", "battle_brief", "rotunda"], + "rooms": ["courtyard", "aula", "battle_brief", "rotunda"], "forced_scene": "cassian_drohnotiz_wren", "beat": "drohnotiz_dein_retter_ist_tot" }, "afternoon": { - "rooms": ["courtyard", "battle_brief", "history_class"], + "rooms": ["courtyard", "aula", "battle_brief", "history_class"], "forced_scene": "", "beat": "graue_schergen_tauchen_auf" }, "evening": { - "rooms": ["courtyard", "dormitory"], + "rooms": ["courtyard", "aula", "dormitory"], "forced_scene": "", "beat": "wren_wird_stiller" } diff --git a/data/story/days/day_05.json b/data/story/days/day_05.json index 8bb9b64..828a430 100644 --- a/data/story/days/day_05.json +++ b/data/story/days/day_05.json @@ -5,17 +5,17 @@ "day_end_location": "imogen_room", "slots": { "morning": { - "rooms": ["courtyard", "history_class", "rotunda"], + "rooms": ["courtyard", "aula", "history_class", "rotunda"], "forced_scene": "markham_vaterluege", "beat": "geschichtsklasse_verlogene_version" }, "afternoon": { - "rooms": ["courtyard", "history_class", "sparring_hall"], + "rooms": ["courtyard", "aula", "history_class", "sparring_hall"], "forced_scene": "cassian_angebot_flur", "beat": "cassian_kein_angriff_ein_angebot" }, "evening": { - "rooms": ["courtyard", "dormitory", "imogen_room"], + "rooms": ["courtyard", "aula", "dormitory", "imogen_room"], "forced_scene": "imogen_night_3", "beat": "imogen_waerme_wird_duenner" } diff --git a/data/story/days/day_06.json b/data/story/days/day_06.json index 5cfa3d6..9261cdb 100644 --- a/data/story/days/day_06.json +++ b/data/story/days/day_06.json @@ -5,17 +5,17 @@ "day_end_location": "dormitory", "slots": { "morning": { - "rooms": ["courtyard", "battle_brief", "rotunda"], + "rooms": ["courtyard", "aula", "battle_brief", "rotunda"], "forced_scene": "", "beat": "unterricht_stats" }, "afternoon": { - "rooms": ["courtyard", "rotunda"], + "rooms": ["courtyard", "aula", "rotunda"], "forced_scene": "graue_rempeln_wren", "beat": "graue_rempeln_wren_verstand_checks" }, "evening": { - "rooms": ["courtyard", "dormitory"], + "rooms": ["courtyard", "aula", "dormitory"], "forced_scene": "", "beat": "distanz_zu_imogen_waechst" } diff --git a/data/story/days/day_07.json b/data/story/days/day_07.json index 973f23d..dc35633 100644 --- a/data/story/days/day_07.json +++ b/data/story/days/day_07.json @@ -5,17 +5,17 @@ "day_end_location": "imogen_room", "slots": { "morning": { - "rooms": ["courtyard", "sparring_hall"], + "rooms": ["courtyard", "aula", "sparring_hall"], "forced_scene": "imogen_beobachtet_training", "beat": "imogen_sieht_wie_hart_er_wird" }, "afternoon": { - "rooms": ["courtyard", "sparring_hall", "rotunda"], + "rooms": ["courtyard", "aula", "sparring_hall", "rotunda"], "forced_scene": "wren_eskorte_1", "beat": "wren_traut_sich_nicht_allein" }, "evening": { - "rooms": ["courtyard", "dormitory", "imogen_room"], + "rooms": ["courtyard", "aula", "dormitory", "imogen_room"], "forced_scene": "imogen_night_4", "beat": "violet_herz_fenster" } diff --git a/data/story/days/day_08.json b/data/story/days/day_08.json index e54bdc4..e0fa28e 100644 --- a/data/story/days/day_08.json +++ b/data/story/days/day_08.json @@ -5,17 +5,17 @@ "day_end_location": "imogen_room", "slots": { "morning": { - "rooms": ["courtyard", "sparring_hall", "battle_brief"], + "rooms": ["courtyard", "aula", "sparring_hall", "battle_brief"], "forced_scene": "", "beat": "unterricht_stats" }, "afternoon": { - "rooms": ["courtyard", "rotunda"], + "rooms": ["courtyard", "aula", "rotunda"], "forced_scene": "wren_eskorte_2", "beat": "wren_paranoide_angst" }, "evening": { - "rooms": ["courtyard", "dormitory", "imogen_room"], + "rooms": ["courtyard", "aula", "dormitory", "imogen_room"], "forced_scene": "imogen_night_5", "beat": "hochexplosive_nacht_halt_oder_tuerenschlagen" } diff --git a/data/story/days/day_09.json b/data/story/days/day_09.json index 8a5d774..c408de1 100644 --- a/data/story/days/day_09.json +++ b/data/story/days/day_09.json @@ -5,7 +5,7 @@ "day_end_location": "dormitory", "slots": { "morning": { - "rooms": ["courtyard", "battle_brief", "sparring_hall"], + "rooms": ["courtyard", "aula", "battle_brief", "sparring_hall"], "forced_scene": "", "beat": "gefechtskunde" }, @@ -15,7 +15,7 @@ "beat": "cassian_hinterhalt_herz_klinge_weiche" }, "evening": { - "rooms": ["courtyard", "dormitory"], + "rooms": ["courtyard", "aula", "dormitory"], "forced_scene": "", "beat": "stille_nach_dem_kampf" } diff --git a/data/story/days/day_10.json b/data/story/days/day_10.json index 7ca8151..2f11e38 100644 --- a/data/story/days/day_10.json +++ b/data/story/days/day_10.json @@ -5,17 +5,17 @@ "day_end_location": "imogen_room", "slots": { "morning": { - "rooms": ["courtyard", "sparring_hall", "battle_brief", "rotunda", "history_class"], + "rooms": ["courtyard", "aula", "sparring_hall", "battle_brief", "rotunda", "history_class"], "forced_scene": "", "beat": "freier_tag_werte_maximieren" }, "afternoon": { - "rooms": ["courtyard", "sparring_hall", "battle_brief", "rotunda", "history_class"], + "rooms": ["courtyard", "aula", "sparring_hall", "battle_brief", "rotunda", "history_class"], "forced_scene": "", "beat": "freier_tag_squad_codex" }, "evening": { - "rooms": ["courtyard", "dormitory", "imogen_room"], + "rooms": ["courtyard", "aula", "dormitory", "imogen_room"], "forced_scene": "imogen_night_6_schwur", "beat": "imogen_hand_auf_relikt_gauntlet_teaser" } diff --git a/docs/CHANGEREQUESTS.md b/docs/CHANGEREQUESTS.md index 2d8ac20..91bf7e6 100644 --- a/docs/CHANGEREQUESTS.md +++ b/docs/CHANGEREQUESTS.md @@ -142,73 +142,20 @@ - Charaktermomente (Ridoc zockt, Imogen blufft, Wren traut sich kaum). - Default: Poker + Messerspiel zuerst; eigenes Kartenspiel als späterer Stretch. -## 14. Karten-Fix: Schlafsaal-Tür raus + Aula (Gathering Hall) bauen -> Kaddis-Runde 2 / Karten-Anpassung. Klein-bis-mittel, gut isoliert baubar. -- **Verwaiste Tür im Erstjahr-Schlafsaal entfernen:** Im Massenschlafsaal - (`first_year_barracks`-Szene) hängt noch ein Zonen-Trigger/eine Tür zum - **entfernten Klassenraum**. Die Klassenraum-Migration (DONE 2026-07-13) hat nur - die **Hof**-Tür entfernt — diese hier ist übrig geblieben. Raus damit (Tür + - Trigger + ggf. Spawn-Marker); Kanon-Nachbarschaft des Schlafsaals ist der Gang - zur Rotunda (locations/citadel/FIRST_YEAR_BARRACKS.md), kein Klassenraum. -- **Neuer Greybox-Raum „Aula" (Gathering Hall)** nach SPEC §5.1 bauen: - lange Tisch-/Bank-Reihen, Essensausgabe-Theke, dahinter **Küchen-Bereich** - (Herd-/Arbeitsflächen-Boxen, Dampf-Partikel, Warmlicht), **Minispiel-Ecke** - (runder Tisch + Hocker). Belebt mit „Die Grauen" + NPCs (Ridoc/Imogen/Wren). -- **Anbindung:** Zonen-Tür vom **Hof** (wie die übrigen Räume), Rückweg „Zum Hof"; - Spawn-Punkte beidseitig. Fahrplan-Verfügbarkeit (`is_room_available`) wie bei - den anderen Räumen respektieren (Aula sollte in den meisten Slots offen sein — - sozialer Raum). -- **Minispiele (CR 13) hier verorten:** Die Minispiel-Ecke der Aula ist ihr - Zuhause (Poker/Messerspiel). CR 13 baut darauf auf. -- Optional: Essen als sozialer Slot mit kleinem Buff (später, nicht Pflicht). - -## 15. Hub-Layout an die offizielle Basgiath-Karte anpassen -> Kaddis-Runde 2 / Karten-Anpassung. Referenz-Bilder: `docs/reference/` (lokal, -> nicht committet); **maßgeblich ist ORTE.md, „Räumliche Anordnung"** (der Text, -> nicht das Bild). Betrifft nur die **Anordnung**, nicht die Räume selbst (die -> existieren bereits). -- **Der zentrale Hof IST der Reiterquadrant** — bleibt der Hub. Nur die - **Tor-Anordnung** an die Karte angleichen (Ring von Gebäuden um den Hof). -- **Unterrichtsräume im „Lehrtrakt" bündeln:** Sparringshalle, Hörsaal, - Kaoris Klassenzimmer und Landnavigation liegen kanonisch **zusammen** in einem - Gebäude (Academic Wing/Lehrtrakt), NICHT über den Hof verstreut. Türen an einer - Hof-Seite gruppieren (oder ein Lehrtrakt-Vorraum mit Abzweigen). -- **Rotunde + Aula (Gathering Hall) benachbart** clustern; **Schlafsäle - (First Years)** und **Wohntrakt (Dorms, inkl. Imogens Zimmer)** an einer anderen - Seite. -- **Außentore aus dem Hof:** Parapet (Eingang), Gauntlet→Flugfeld (hinauf), Tal - unterhalb der Zitadelle = Dreschen (hinunter). Main Building unten bleibt - Kulisse/Backdrop (nicht begehbar in v1). -- **Namens-Setzung (entschieden, siehe ORTE.md):** Die Gathering Hall heißt im - Spiel **„Aula"** (dt. Offizialkarte). **Deveras Raum ist der „Hörsaal"** (Fach: - Gefechtskunde) — NICHT die Aula. Der frühere Spielname „Mensa" wird nicht mehr - verwendet. -- Klein-bis-mittel; kann mit CR 14 (Aula-Bau) zusammen erledigt werden. - --- ## Phasen-Plan (Reihenfolge für den Entwickler-Claude) -> _Status (2026-07-18, Claude): **Phasen 7–11 sind erledigt — das -> Autoren-Sitzungs-Programm (CR 1/2/3/4) ist damit komplett; CR 7 -> (stehendes Gauntlet-Rad) ebenfalls erledigt**, siehe CHANGEREQUESTS_DONE. -> Offen: CR 5 (Staffel-Setup) und CR 6 (zweite Siegelkraft — **Kraft -> entschieden & ausspezifiziert**, es fehlt nur noch die Umsetzung im -> SignetSystem: geheimes Zweitsignet hinter eigenem Flag, in v1 nur latent)._ +> _Status (2026-07-19, Claude): **Welle 1 ist komplett abgearbeitet** — +> CR 16 (Speichersystem), CR 6 (Zweitsignet latent), CR 5 (Staffel-Setup) +> und CR 14+15 (Aula + Hub-Layout) sind erledigt, siehe +> CHANGEREQUESTS_DONE. Damit sind auch die Phasen 7–11 und CR 1–7 durch._ > -> _Neu (2026-07-18, Kaddis-Runde 2): **CR 8–15.** Empfohlene Reihenfolge:_ -> - _**CR 8 (Kampfsystem-Action-RPG)** ist das große neue Programm und selbst -> mehrphasig — eigener Track, sollte früh starten, weil es Sparring/Hinterhalt/ -> Permadeath berührt._ -> - _CR 9 + CR 10 (Bindungs-Achse + Drachenpflege) gehören zusammen und greifen -> erst **ab Akt 2** (nach dem Dreschen) — nach der Siegelkraft-Basis (CR 6)._ -> - _CR 11 (Gefechtskunde-Karte) ist ein Aufsatz auf CR 4 (Lexicon/Unterricht, -> bereits erledigt) — gut isoliert baubar._ -> - _CR 12 (Blätter jagen) hängt an CR 2 (Zirkel) + CR 4 (Lexicon) — Zulieferer, -> gut isoliert._ -> - _CR 13 (Minispiele) ist ein eigenständiges Flavor-Modul, jederzeit machbar — -> verortet in der Aula (CR 14)._ -> - _CR 14 (Aula-Bau + Schlafsaal-Tür-Fix) + CR 15 (Hub-Layout an die -> Basgiath-Karte) sind das Karten-Cluster — zusammen erledigen; CR 14 ist -> Voraussetzung für CR 13._ +> _Offen (Reihenfolge nach ROADMAP.md):_ +> - _**Welle 2: CR 8 (Kampfsystem-Action-RPG)** — das große Programm in den +> Sub-CRs 8a→8e; berührt Sparring und den Tag-9-Hinterhalt._ +> - _Welle 3 (Flavor auf fertigen Systemen): CR 11 (Gefechtskunde-Karte), +> CR 12 (Blätter jagen), CR 13 (Minispiele — die Aula-Ecke steht jetzt)._ +> - _Welle 4 (Akt 2, jenseits v1): CR 9 (Bindungs-Achse), CR 10 +> (Drachenpflege), CR 8-magie, CR-16-Rest (Camp im Feld)._ > > _Vollständige, gewichtete Reihenfolge in Wellen: **ROADMAP.md**._ diff --git a/docs/CHANGEREQUESTS_DONE.md b/docs/CHANGEREQUESTS_DONE.md index 2a47a77..0630c54 100644 --- a/docs/CHANGEREQUESTS_DONE.md +++ b/docs/CHANGEREQUESTS_DONE.md @@ -85,6 +85,54 @@ Gewichts-Summe + `randi_range`), damit das Feld tatsächlich wirkt statt nur dekorativ zu sein. Die zehn ursprünglichen erfundenen Siegelkräfte bleiben als Baseline (weight 10) erhalten. +## 2026-07-19 — CR 14 + CR 15: Aula-Bau, Schlafsaal-Tür-Fix, Hub-Layout (Welle 1 abgeschlossen) + +**Request (CR 14):** Verwaiste Klassenraum-Tür im Erstjahr-Schlafsaal +entfernen; Greybox-Aula (Gathering Hall) nach SPEC §5.1 bauen — lange +Tisch-/Bankreihen, Essensausgabe mit Küchen-Bereich (Dampf, Warmlicht), +Minispiel-Ecke, belebt mit „Die Grauen" + Ridoc/Imogen/Wren; Zonen-Tür +vom Hof samt Rückweg und Fahrplan-Verfügbarkeit. +**Request (CR 15):** Hub-Tore nach ORTE.md „Räumliche Anordnung" +gruppieren (Text maßgeblich, nicht das Referenzbild): Lehrtrakt +gebündelt, Rotunde + Aula benachbart, Schlafsäle/Wohntrakt auf einer +anderen Seite, Außentore Parapet/Gauntlet/Tal; Namens-Setzung Aula vs. +Hörsaal. + +**Umsetzung:** +- **Aula** (`scenes/hub/aula.tscn`): 22×14-Saal mit zwei Tisch-Reihen + samt Bänken, Essensausgabe-Theke, dahinter Küche (zwei Herd-Boxen, + Dampf-Partikel, warmes Punktlicht), Minispiel-Ecke (runder Tisch + + drei Hocker, eigene Beleuchtung) als Heimat für CR 13. Belebt: + Imogen/Wren an Tisch 1, Ridoc am Spieltisch (alle mit Googly Eyes), + vier „Grauen" über den GreySpawner (ohne Schergen — sozialer Raum). +- **Anbindung:** Tür „Zur Aula" am Hof (room_id `aula`, damit der + Fahrplan greift) + Rückweg „Zum Hof", Spawn-Marker beidseitig + (`FromAula`). Die Aula ist in **allen zehn Tagesplänen** überall dort + offen, wo auch der Hof offen ist — der Tag-9-Nachmittag bleibt + exklusiv beim Materialraum-Hinterhalt. +- **Schlafsaal-Tür-Fix:** Zonen-Trigger + Mesh + Label + Spawn-Marker + zum entfernten Klassenraum aus `dormitory.tscn` gelöscht; der + Rückweg zum Hof bleibt unangetastet. +- **Hub-Layout nach ORTE.md:** Westwand = **Lehrtrakt** (Sparringshalle, + Hörsaal, Geschichtsklasse) plus die benachbarten **Rotunde und Aula**; + Ostwand = **Schlafsaal + Wohntrakt** (Imogens Zimmer) und der + Materialraum; Südwand = **Außentore** (Gauntlet hinauf, „Hinab ins + Tal — zu den Drachen") plus das neue **Parapet-Tor als Kulisse** + (Eingang der Zitadelle, nicht begehbar). Alle Spawn-Marker und das + Eskorte-Ziel (Rotunden-Tür) mitgezogen; verwaiste Marker + (FromClassroom/FromMapRoom) entfernt. +- **Namens-Setzung:** Hof-Label jetzt „Zum Hörsaal (Gefechtskunde)"; + Codex- und Lexicon-Texte sagen „Hörsaal" statt „Aula" für Deveras + Raum — die Aula ist ausschließlich der Ess-/Sozialsaal. + +**Verifikation:** Sonde 24/24 grün (Fahrplan inkl. Tag-9-Ausnahme; +Layout-Prüfung aller Tor-Positionen und Cluster; Aula-Roundtrip Hof → +Aula → Hof mit korrektem Spawn; Ausstattung Theke/Dampf/Minispiel-Ecke/ +NPCs/Graue; Fahrplan-Sperre der Aula-Tür am Tag-9-Nachmittag; +Schlafsaal-Tür + Marker entfernt, Rückweg intakt). Boot-Checks Aula, +Hof und Schlafsaal fehlerfrei. **Damit ist Welle 1 der ROADMAP +vollständig abgearbeitet.** + ## 2026-07-19 — CR 5: Tyrveil ins Vierte Geschwader / Violets Staffel (Welle 1) **Request:** Tyrveil sichtbar in dieselbe Staffel und dasselbe diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index 58b3c06..029faa6 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -5,9 +5,9 @@ > stehen weiter in CHANGEREQUESTS.md, der Kanon in SPEC > STORY > WELT. Erledigte > CRs wandern nach CHANGEREQUESTS_DONE.md; dann hier den Status nachziehen. > -> Stand: **2026-07-19**. Erledigt: Phasen 0–11, CR 1–4, **CR 7**. Offen: CR 5, -> CR 6, CR 8 (in Sub-CRs 8a–8e zerlegt), CR 9–15, **CR 16** (Permadeath raus → -> Speicher-/Camp-System). +> Stand: **2026-07-19**. Erledigt: Phasen 0–11, CR 1–7, **CR 14, CR 15, CR 16** +> (Welle 1 komplett). Offen: CR 8 (in Sub-CRs 8a–8e zerlegt, Welle 2), +> CR 11–13 (Welle 3), CR 9/10/8-magie/CR-16-Camp (Welle 4, Akt 2). ## Leitprinzip der Reihenfolge Erst **Entscheidungs-Blocker räumen** (billig, schaltet Ketten frei), dann @@ -34,7 +34,7 @@ Reine Doc-/Design-Arbeit, kein Code. Beide Blocker sind geräumt: Grammatik leicht/schwer/Ausweichen/Dodge/Magie/Kombo; Waffenskill pro Waffe ohne Rohschaden-Bruch; Permadeath raus → CR 16). Details: CHANGEREQUESTS §8. -## Welle 1 — Kleine isolierte Stabilisierer (parallelisierbar) +## Welle 1 — Kleine isolierte Stabilisierer — ✅ erledigt (2026-07-19) - **CR 6 — Umsetzung des Zweitsignets** (Entscheidung steht, s. Welle 0). Klein, weil in v1 nur latent: beim Dreschen zusätzlich zum regulären Siegelkraft ein **fixes, geheimes zweites** hinter eigenem Flag setzen (nicht im normalen @@ -94,6 +94,6 @@ Greifen erst nach Dreschen + erstem Flug; brauchen die CR-6-Basis. | 11 | Gefechtskunde-Karte | 3 | offen | | 12 | Blätter jagen | 3 | offen | | 13 | Minispiele | 3 (nach CR 14) | offen | -| 14 | Aula-Bau + Tür-Fix | 1 | offen | -| 15 | Hub-Layout an Karte | 1 | offen | +| 14 | Aula-Bau + Tür-Fix | 1 | erledigt (2026-07-19) | +| 15 | Hub-Layout an Karte | 1 | erledigt (2026-07-19) | | 16 | Permadeath raus → Save/Camp | 1 (Camp: Akt 2) | erledigt (2026-07-19); Camp-Rest: Akt 2 | diff --git a/scenes/hub/aula.tscn b/scenes/hub/aula.tscn new file mode 100644 index 0000000..bb91808 --- /dev/null +++ b/scenes/hub/aula.tscn @@ -0,0 +1,454 @@ +[gd_scene load_steps=42 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"] +[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="Script" path="res://scripts/gameplay/grey_spawner.gd" id="5_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.5, 0.42, 0.34, 1) +ground_horizon_color = Color(0.5, 0.42, 0.34, 1) + +[sub_resource type="Sky" id="Sky_sky"] +sky_material = SubResource("ProceduralSkyMaterial_sky") + +[sub_resource type="Environment" id="Environment_env"] +background_mode = 2 +sky = SubResource("Sky_sky") +tonemap_mode = 2 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_floor"] +albedo_color = Color(0.42, 0.36, 0.3, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_floor"] +size = Vector3(22, 1, 14) + +[sub_resource type="BoxMesh" id="BoxMesh_floor"] +material = SubResource("StandardMaterial3D_floor") +size = Vector3(22, 1, 14) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_structure"] +albedo_color = Color(0.5, 0.44, 0.38, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ns"] +size = Vector3(23, 4, 0.5) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ns"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(23, 4, 0.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ew"] +size = Vector3(0.5, 4, 15) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ew"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(0.5, 4, 15) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wood"] +albedo_color = Color(0.45, 0.32, 0.2, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_table"] +size = Vector3(7, 0.8, 1.2) + +[sub_resource type="BoxMesh" id="BoxMesh_table"] +material = SubResource("StandardMaterial3D_wood") +size = Vector3(7, 0.8, 1.2) + +[sub_resource type="BoxShape3D" id="BoxShape3D_bench"] +size = Vector3(7, 0.45, 0.5) + +[sub_resource type="BoxMesh" id="BoxMesh_bench"] +material = SubResource("StandardMaterial3D_wood") +size = Vector3(7, 0.45, 0.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_counter"] +size = Vector3(8, 1.05, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_counter"] +material = SubResource("StandardMaterial3D_wood") +size = Vector3(8, 1.05, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_stove"] +albedo_color = Color(0.3, 0.28, 0.3, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_stove"] +size = Vector3(1.2, 1, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_stove"] +material = SubResource("StandardMaterial3D_stove") +size = Vector3(1.2, 1, 1) + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_round"] +radius = 0.9 +height = 0.85 + +[sub_resource type="CylinderMesh" id="CylinderMesh_round"] +material = SubResource("StandardMaterial3D_wood") +top_radius = 0.9 +bottom_radius = 0.9 +height = 0.85 + +[sub_resource type="CylinderMesh" id="CylinderMesh_stool"] +material = SubResource("StandardMaterial3D_wood") +top_radius = 0.3 +bottom_radius = 0.3 +height = 0.5 + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_npc"] +radius = 0.35 +height = 1.5 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_imogen"] +albedo_color = Color(0.8, 0.45, 0.6, 1) + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_imogen"] +material = SubResource("StandardMaterial3D_imogen") +radius = 0.35 +height = 1.5 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wren"] +albedo_color = Color(0.45, 0.72, 0.45, 1) + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_wren"] +material = SubResource("StandardMaterial3D_wren") +radius = 0.35 +height = 1.5 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ridoc"] +albedo_color = Color(0.85, 0.6, 0.3, 1) + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_ridoc"] +material = SubResource("StandardMaterial3D_ridoc") +radius = 0.35 +height = 1.5 + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_steam"] +direction = Vector3(0, 1, 0) +spread = 12.0 +initial_velocity_min = 0.4 +initial_velocity_max = 0.8 +gravity = Vector3(0, 0.2, 0) +scale_min = 0.4 +scale_max = 0.9 + +[sub_resource type="SphereMesh" id="SphereMesh_steam"] +radius = 0.12 +height = 0.24 + +[sub_resource type="BoxShape3D" id="BoxShape3D_door"] +size = Vector3(2, 2, 2) + +[sub_resource type="BoxMesh" id="BoxMesh_door"] +material = SubResource("StandardMaterial3D_wood") +size = Vector3(2, 2, 0.4) + +[node name="Aula" type="Node3D"] +script = ExtResource("1_room") + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_env") + +[node name="Sun" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.866025, 0.383022, -0.321394, 0, 0.642788, 0.766044, 0.5, -0.663414, 0.55667, 0, 10, 0) +light_energy = 0.7 + +[node name="WarmLight" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.2, 0) +light_color = Color(1, 0.85, 0.6, 1) +light_energy = 1.4 +omni_range = 14.0 + +[node name="Floor" type="StaticBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Floor"] +shape = SubResource("BoxShape3D_floor") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Floor"] +mesh = SubResource("BoxMesh_floor") + +[node name="Walls" type="Node3D" parent="."] + +[node name="WallNorth" type="StaticBody3D" parent="Walls"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, -7.25) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Walls/WallNorth"] +shape = SubResource("BoxShape3D_wall_ns") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Walls/WallNorth"] +mesh = SubResource("BoxMesh_wall_ns") + +[node name="WallSouth" type="StaticBody3D" parent="Walls"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 7.25) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Walls/WallSouth"] +shape = SubResource("BoxShape3D_wall_ns") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Walls/WallSouth"] +mesh = SubResource("BoxMesh_wall_ns") + +[node name="WallEast" type="StaticBody3D" parent="Walls"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.25, 2, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Walls/WallEast"] +shape = SubResource("BoxShape3D_wall_ew") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Walls/WallEast"] +mesh = SubResource("BoxMesh_wall_ew") + +[node name="WallWest" type="StaticBody3D" parent="Walls"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.25, 2, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Walls/WallWest"] +shape = SubResource("BoxShape3D_wall_ew") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Walls/WallWest"] +mesh = SubResource("BoxMesh_wall_ew") + +[node name="Tables" type="Node3D" parent="."] + +[node name="Table1" type="StaticBody3D" parent="Tables"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0.4, -0.8) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tables/Table1"] +shape = SubResource("BoxShape3D_table") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Tables/Table1"] +mesh = SubResource("BoxMesh_table") + +[node name="Bench1N" type="StaticBody3D" parent="Tables"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0.225, -1.75) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tables/Bench1N"] +shape = SubResource("BoxShape3D_bench") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Tables/Bench1N"] +mesh = SubResource("BoxMesh_bench") + +[node name="Bench1S" type="StaticBody3D" parent="Tables"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0.225, 0.15) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tables/Bench1S"] +shape = SubResource("BoxShape3D_bench") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Tables/Bench1S"] +mesh = SubResource("BoxMesh_bench") + +[node name="Table2" type="StaticBody3D" parent="Tables"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0.4, 2.6) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tables/Table2"] +shape = SubResource("BoxShape3D_table") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Tables/Table2"] +mesh = SubResource("BoxMesh_table") + +[node name="Bench2N" type="StaticBody3D" parent="Tables"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0.225, 1.65) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tables/Bench2N"] +shape = SubResource("BoxShape3D_bench") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Tables/Bench2N"] +mesh = SubResource("BoxMesh_bench") + +[node name="Bench2S" type="StaticBody3D" parent="Tables"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0.225, 3.55) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tables/Bench2S"] +shape = SubResource("BoxShape3D_bench") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Tables/Bench2S"] +mesh = SubResource("BoxMesh_bench") + +[node name="Ausgabe" type="Node3D" parent="."] + +[node name="Theke" type="StaticBody3D" parent="Ausgabe"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0.525, -5.4) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Ausgabe/Theke"] +shape = SubResource("BoxShape3D_counter") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Ausgabe/Theke"] +mesh = SubResource("BoxMesh_counter") + +[node name="NameLabel" type="Label3D" parent="Ausgabe/Theke"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0) +billboard = 1 +text = "Essensausgabe" +font_size = 44 +outline_size = 12 + +[node name="Herd1" type="StaticBody3D" parent="Ausgabe"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0.5, -6.5) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Ausgabe/Herd1"] +shape = SubResource("BoxShape3D_stove") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Ausgabe/Herd1"] +mesh = SubResource("BoxMesh_stove") + +[node name="Herd2" type="StaticBody3D" parent="Ausgabe"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.4, 0.5, -6.5) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Ausgabe/Herd2"] +shape = SubResource("BoxShape3D_stove") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Ausgabe/Herd2"] +mesh = SubResource("BoxMesh_stove") + +[node name="Dampf" type="GPUParticles3D" parent="Ausgabe"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.2, 1.4, -6.5) +amount = 12 +lifetime = 2.5 +process_material = SubResource("ParticleProcessMaterial_steam") +draw_pass_1 = SubResource("SphereMesh_steam") + +[node name="Kuechenlicht" type="OmniLight3D" parent="Ausgabe"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.2, 2.4, -6.2) +light_color = Color(1, 0.75, 0.45, 1) +light_energy = 1.6 +omni_range = 6.0 + +[node name="MinispielEcke" type="Node3D" parent="."] + +[node name="RunderTisch" type="StaticBody3D" parent="MinispielEcke"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.3, 0.425, 4.4) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="MinispielEcke/RunderTisch"] +shape = SubResource("CylinderShape3D_round") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MinispielEcke/RunderTisch"] +mesh = SubResource("CylinderMesh_round") + +[node name="NameLabel" type="Label3D" parent="MinispielEcke/RunderTisch"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) +billboard = 1 +text = "Spieltisch" +font_size = 40 +outline_size = 12 + +[node name="Hocker1" type="MeshInstance3D" parent="MinispielEcke"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.2, 0.25, 4.4) +mesh = SubResource("CylinderMesh_stool") + +[node name="Hocker2" type="MeshInstance3D" parent="MinispielEcke"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.4, 0.25, 4.4) +mesh = SubResource("CylinderMesh_stool") + +[node name="Hocker3" type="MeshInstance3D" parent="MinispielEcke"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.3, 0.25, 5.5) +mesh = SubResource("CylinderMesh_stool") + +[node name="Eckenlicht" type="OmniLight3D" parent="MinispielEcke"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.3, 2.4, 4.4) +light_color = Color(1, 0.8, 0.55, 1) +light_energy = 1.1 +omni_range = 5.0 + +[node name="Gaeste" type="Node3D" parent="."] + +[node name="Imogen" type="StaticBody3D" parent="Gaeste"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5, 0, -1.75) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Gaeste/Imogen"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0) +shape = SubResource("CapsuleShape3D_npc") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Gaeste/Imogen"] +transform = Transform3D(-1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0.75, 0) +mesh = SubResource("CapsuleMesh_imogen") + +[node name="GooglyEyes" parent="Gaeste/Imogen/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, -0.28) + +[node name="NameLabel" type="Label3D" parent="Gaeste/Imogen"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +billboard = 1 +text = "Imogen" +font_size = 48 +outline_size = 12 + +[node name="Wren" type="StaticBody3D" parent="Gaeste"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0, -1.75) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Gaeste/Wren"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0) +shape = SubResource("CapsuleShape3D_npc") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Gaeste/Wren"] +transform = Transform3D(-1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0.75, 0) +mesh = SubResource("CapsuleMesh_wren") + +[node name="GooglyEyes" parent="Gaeste/Wren/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, -0.28) + +[node name="NameLabel" type="Label3D" parent="Gaeste/Wren"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +billboard = 1 +text = "Wren" +font_size = 48 +outline_size = 12 + +[node name="Ridoc" type="StaticBody3D" parent="Gaeste"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.3, 0, 3.3) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Gaeste/Ridoc"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0) +shape = SubResource("CapsuleShape3D_npc") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Gaeste/Ridoc"] +transform = Transform3D(-1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0.75, 0) +mesh = SubResource("CapsuleMesh_ridoc") + +[node name="GooglyEyes" parent="Gaeste/Ridoc/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, -0.28) + +[node name="NameLabel" type="Label3D" parent="Gaeste/Ridoc"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +billboard = 1 +text = "Ridoc" +font_size = 48 +outline_size = 12 + +[node name="GreySpawner" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 1) +script = ExtResource("5_grey") +ambient_count = 4 +scherge_count = 0 +spawn_extents = Vector3(6, 0, 4) + +[node name="Triggers" type="Node3D" parent="."] + +[node name="TriggerRiderQuadrant" type="Area3D" parent="Triggers"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 6.2) +collision_layer = 0 +collision_mask = 2 +script = ExtResource("4_zone") +target_scene_path = "res://scenes/hub/rider_quadrant.tscn" +target_spawn_name = "FromAula" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerRiderQuadrant"] +shape = SubResource("BoxShape3D_door") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerRiderQuadrant"] +mesh = SubResource("BoxMesh_door") + +[node name="Label3D" type="Label3D" parent="Triggers/TriggerRiderQuadrant"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) +billboard = 1 +text = "Zum Hof" +font_size = 40 +outline_size = 12 + +[node name="SpawnPoints" type="Node3D" parent="."] + +[node name="FromRiderQuadrant" type="Marker3D" parent="SpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 4.2) + +[node name="Player" parent="." instance=ExtResource("2_player")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 4.2) + +[node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] diff --git a/scenes/hub/dormitory.tscn b/scenes/hub/dormitory.tscn index df2f981..2f6c64f 100644 --- a/scenes/hub/dormitory.tscn +++ b/scenes/hub/dormitory.tscn @@ -221,35 +221,11 @@ text = "Zum Reiterquadrant" font_size = 40 outline_size = 12 -[node name="TriggerClassroom" type="Area3D" parent="Triggers"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.4, 1, 2) -collision_layer = 0 -collision_mask = 2 -script = ExtResource("4_zone") -target_scene_path = "res://scenes/hub/classroom.tscn" -target_spawn_name = "FromDormitory" - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerClassroom"] -shape = SubResource("BoxShape3D_door_w") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerClassroom"] -mesh = SubResource("BoxMesh_door_w") - -[node name="Label3D" type="Label3D" parent="Triggers/TriggerClassroom"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) -billboard = 1 -text = "Zum Klassenraum" -font_size = 40 -outline_size = 12 - [node name="SpawnPoints" type="Node3D" parent="."] [node name="FromRiderQuadrant" type="Marker3D" parent="SpawnPoints"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 2.8) -[node name="FromClassroom" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.8, 0.1, 0.5) - [node name="Player" parent="." instance=ExtResource("2_player")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 2.8) diff --git a/scenes/hub/rider_quadrant.tscn b/scenes/hub/rider_quadrant.tscn index dad6a78..aabf172 100644 --- a/scenes/hub/rider_quadrant.tscn +++ b/scenes/hub/rider_quadrant.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=58 format=3] +[gd_scene load_steps=60 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"] @@ -126,6 +126,13 @@ size = Vector3(1.8, 1.2, 0.15) material = SubResource("StandardMaterial3D_board") size = Vector3(1.8, 1.2, 0.15) +[sub_resource type="BoxShape3D" id="BoxShape3D_gate"] +size = Vector3(3.4, 3.6, 0.5) + +[sub_resource type="BoxMesh" id="BoxMesh_gate"] +material = SubResource("StandardMaterial3D_board") +size = Vector3(3.4, 3.6, 0.5) + [sub_resource type="SphereShape3D" id="SphereShape3D_interact"] radius = 2.5 @@ -507,6 +514,24 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8, 0) script = ExtResource("18_xaden") xaden_path = NodePath("../Xaden") +[node name="ParapetTor" type="StaticBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0, 19.4) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="ParapetTor"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0) +shape = SubResource("BoxShape3D_gate") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="ParapetTor"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0) +mesh = SubResource("BoxMesh_gate") + +[node name="NameLabel" type="Label3D" parent="ParapetTor"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.1, 0) +billboard = 1 +text = "Parapet-Tor — Eingang der Zitadelle" +font_size = 44 +outline_size = 12 + [node name="Aushang" type="StaticBody3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0, 18.6) script = ExtResource("17_evidence") @@ -555,7 +580,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.7, 0) [node name="Triggers" type="Node3D" parent="."] [node name="TriggerDormitory" type="Area3D" parent="Triggers"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 1, -19) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 1, -8) collision_layer = 0 collision_mask = 2 script = ExtResource("5_zone") @@ -576,7 +601,7 @@ font_size = 48 outline_size = 12 [node name="TriggerSparringHall" type="Area3D" parent="Triggers"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19, 1, 4) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19, 1, -14) collision_layer = 0 collision_mask = 2 script = ExtResource("5_zone") @@ -618,7 +643,7 @@ font_size = 48 outline_size = 12 [node name="TriggerHatching" type="Area3D" parent="Triggers"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1, -19) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1, 19) visible = false collision_layer = 0 collision_mask = 2 @@ -635,7 +660,29 @@ mesh = SubResource("BoxMesh_trigger") [node name="Label3D" type="Label3D" parent="Triggers/TriggerHatching"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) billboard = 1 -text = "Zu den Drachen" +text = "Hinab ins Tal — zu den Drachen" +font_size = 48 +outline_size = 12 + +[node name="TriggerAula" type="Area3D" parent="Triggers"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19, 1, 13) +collision_layer = 0 +collision_mask = 2 +script = ExtResource("5_zone") +target_scene_path = "res://scenes/hub/aula.tscn" +target_spawn_name = "FromRiderQuadrant" +room_id = "aula" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerAula"] +shape = SubResource("BoxShape3D_trigger") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerAula"] +mesh = SubResource("BoxMesh_trigger") + +[node name="Label3D" type="Label3D" parent="Triggers/TriggerAula"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) +billboard = 1 +text = "Zur Aula" font_size = 48 outline_size = 12 @@ -657,12 +704,12 @@ mesh = SubResource("BoxMesh_trigger") [node name="Label3D" type="Label3D" parent="Triggers/TriggerBattleBrief"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) billboard = 1 -text = "Zur Gefechtskunde-Aula" +text = "Zum Hörsaal (Gefechtskunde)" font_size = 48 outline_size = 12 [node name="TriggerRotunda" type="Area3D" parent="Triggers"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 1, -8) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19, 1, 6) collision_layer = 0 collision_mask = 2 script = ExtResource("5_zone") @@ -684,7 +731,7 @@ font_size = 48 outline_size = 12 [node name="TriggerHistoryClass" type="Area3D" parent="Triggers"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 1, 19) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19, 1, -1) collision_layer = 0 collision_mask = 2 script = ExtResource("5_zone") @@ -706,7 +753,7 @@ font_size = 48 outline_size = 12 [node name="TriggerImogenRoom" type="Area3D" parent="Triggers"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 1, 19) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 1, 0) collision_layer = 0 collision_mask = 2 script = ExtResource("5_zone") @@ -752,28 +799,25 @@ outline_size = 12 [node name="SpawnPoints" type="Node3D" parent="."] [node name="FromDormitory" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0.1, -16) - -[node name="FromClassroom" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0.1, -16) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5, 0.1, -8) [node name="FromSparringHall" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.5, 0.1, 4) - -[node name="FromMapRoom" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5, 0.1, 4) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.5, 0.1, -14) [node name="FromBattleBrief" type="Marker3D" parent="SpawnPoints"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.5, 0.1, -8) [node name="FromRotunda" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5, 0.1, -8) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.5, 0.1, 6) [node name="FromHistoryClass" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 0.1, 16) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.5, 0.1, -1) + +[node name="FromAula" type="Marker3D" parent="SpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.5, 0.1, 13) [node name="FromImogenRoom" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 0.1, 16) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5, 0.1, 0) [node name="FromMaterialRoom" type="Marker3D" parent="SpawnPoints"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5, 0.1, 12) @@ -782,7 +826,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5, 0.1, 12) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 16) [node name="FromHatching" type="Marker3D" parent="SpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0.1, -16) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0.1, 16) [node name="GreySpawner" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) @@ -809,7 +853,7 @@ wren_path = NodePath("../Wren") hatching_trigger_path = NodePath("../Triggers/TriggerHatching") [node name="EscortTarget" type="Marker3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 0.1, -8) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0.1, 6) [node name="NpcWaypoints" type="Node3D" parent="."]