From 806d938adab3ecab0c79f4707fb90b07a5481063 Mon Sep 17 00:00:00 2001 From: danny Date: Sat, 4 Jul 2026 16:55:06 +0200 Subject: [PATCH] Phase 1b: Slide + Klettern, TimeSystem, Greybox-Hub mit Zonen-Wechsel - player.gd: Zustandsmaschine NORMAL/SLIDING/CLIMBING; Slide ueber slide-Action mit geschwindigkeitsabhaengigem Impuls und reduzierter Kapselhoehe (Shape wird dupliziert, geteilte NPC-Shapes bleiben unberuehrt), kein Slide im Stand; Sprung ueber jump-Action; automatisches Hochziehen an Kanten bis 2,2 m per Raycast-Kantenerkennung mit Kopffreiheits-Check - TimeSystem: Slots Vormittag/Nachmittag/Abend, advance_slot() mit Signal, end_day() (Schlafsaal) erhoeht Tageszaehler, In-Memory ohne Save-Anbindung - Greybox-Hub: rider_quadrant (Start, Imogen zieht hierher um), dormitory (Schlaf-Trigger beendet Tag), classroom; ZoneTrigger mit Spawn-Punkt-Handling, Uebergaenge zwischen allen drei Raeumen - Player und Debug-Overlay als eigene Szenen extrahiert; test_ground bleibt reine Bewegungs-Testszene ohne Imogen - Hauptmenue laedt rider_quadrant, Neues Spiel resettet auch TimeSystem - Debug-Overlay: Tages-Slot, Tageszaehler und Bewegungszustand - Headless verifiziert: Klettern, Slide (Hoehe/Ende), Slide-Verbot im Stand, Spawn-Platzierung, Trigger-Erkennung, Szenen-Boots Co-Authored-By: Claude Fable 5 --- prompts/phase-1b.md | 62 ++++++ scenes/hub/classroom.tscn | 259 ++++++++++++++++++++++++++ scenes/hub/dormitory.tscn | 256 +++++++++++++++++++++++++ scenes/hub/rider_quadrant.tscn | 249 +++++++++++++++++++++++++ scenes/player.tscn | 39 ++++ scenes/test_ground.tscn | 106 +---------- scenes/ui/debug_overlay.tscn | 15 ++ scripts/autoloads/time_system.gd | 61 +++++- scripts/gameplay/hub_room.gd | 30 +++ scripts/gameplay/hub_room.gd.uid | 1 + scripts/gameplay/player.gd | 209 +++++++++++++++++---- scripts/gameplay/sleep_trigger.gd | 20 ++ scripts/gameplay/sleep_trigger.gd.uid | 1 + scripts/gameplay/zone_trigger.gd | 35 ++++ scripts/gameplay/zone_trigger.gd.uid | 1 + scripts/ui/debug_overlay.gd | 17 +- scripts/ui/main_menu.gd | 6 +- 17 files changed, 1226 insertions(+), 141 deletions(-) create mode 100644 prompts/phase-1b.md create mode 100644 scenes/hub/classroom.tscn create mode 100644 scenes/hub/dormitory.tscn create mode 100644 scenes/hub/rider_quadrant.tscn create mode 100644 scenes/player.tscn create mode 100644 scenes/ui/debug_overlay.tscn create mode 100644 scripts/gameplay/hub_room.gd create mode 100644 scripts/gameplay/hub_room.gd.uid create mode 100644 scripts/gameplay/sleep_trigger.gd create mode 100644 scripts/gameplay/sleep_trigger.gd.uid create mode 100644 scripts/gameplay/zone_trigger.gd create mode 100644 scripts/gameplay/zone_trigger.gd.uid diff --git a/prompts/phase-1b.md b/prompts/phase-1b.md new file mode 100644 index 0000000..f62e019 --- /dev/null +++ b/prompts/phase-1b.md @@ -0,0 +1,62 @@ +# Phase 1b — Kickoff-Prompt für Claude Code + +Du arbeitest weiter an "Windgeschworen" (Godot 4.7, GDScript). Lies vor Beginn +docs/SPEC.md, docs/STORY.md und docs/CHARACTERS.md erneut vollständig. Halte +dich an die Konventionen aus SPEC.md Abschnitt 3 (keine Inline-Kommentare, nur +##-Doku-Blöcke über Funktionen/Klassen). + +Voraussetzung: Der Bugfix aus dem letzten Review (confirm-Action reagierte im +Hauptmenü nicht auf Tastatur/Controller, nur Maus) muss committet sein, bevor +du startest. Falls nicht, behebe ihn zuerst. + +Umfang Phase 1b (NUR das, nichts vorwegnehmen): + +1. Movement-Upgrade in scripts/gameplay/player.gd: + - Slide: Auslöser über die slide-Action (C / L2). Kurzer, geschwindigkeits- + abhängiger Rutsch-Impuls in Bewegungsrichtung, reduzierte Kollisionshöhe + während des Slides, danach sauberer Übergang zurück in den normalen + Bewegungszustand. Kein Slide im Stand. + - Klettern: Wenn der Spieler im Sprung (jump-Action) gegen eine Kante + stößt, die niedriger als eine definierte Maximalhöhe ist, automatisches + Hochziehen auf die Kante (einfache Kantenerkennung per Raycast, kein + komplexes IK). Sauberer Übergang zurück in normale Bewegung nach dem + Hochziehen. + - Beide Mechaniken müssen mit Tastatur UND Controller funktionieren. + +2. TimeSystem (scripts/autoloads/time_system.gd) mit echter Logik füllen: + - Slots: Vormittag, Nachmittag, Abend (Enum oder Konstanten). + - Methode zum Vorrücken auf den nächsten Slot, Signal bei Slot-Wechsel. + - Schlafsaal-Trigger beendet den Tag: springt zurück auf Vormittag, + erhöht einen Tageszähler. + - Wird noch NICHT an Save/Load angebunden — das folgt, sobald der TimeSystem- + Zustand feststeht; für 1b reicht In-Memory-Zustand. + +3. Greybox-Hub: drei Räume aus Primitiven, als eigene Szenen unter scenes/hub/: + - scenes/hub/rider_quadrant.tscn (Außenbereich, Startpunkt) + - scenes/hub/dormitory.tscn (Schlafsaal, enthält den Schlafsaal-Trigger + aus Punkt 2) + - scenes/hub/classroom.tscn (Klassenraum, reiner Greybox-Raum ohne + Funktion in 1b, nur begehbar) + Jeder Raum: Boden, Wände als Boxen, klar erkennbare Übergangs-Trigger + (Area3D) zu den jeweils anderen Räumen. Zonen-Wechsel lädt die Zielszene + und platziert den Spieler an einem definierten Eingangspunkt (kein + change_scene_to_file() ohne Positions-Handling — Spieler darf nicht im + Boden spawnen). + Imogen aus 1a zieht mit in rider_quadrant.tscn um (ersetzt ihre Position + in test_ground.tscn). test_ground.tscn bleibt als reine Bewegungs- + Testszene bestehen, ist aber nicht mehr Teil des Spielflusses. + main_menu.tscn "Neues Spiel" lädt jetzt rider_quadrant.tscn statt + test_ground.tscn. + +4. Debug-Overlay erweitern: zeige zusätzlich aktuellen Tages-Slot und + Tageszähler aus TimeSystem. + +Nicht in diesem Schritt: Save/Load-Anbindung von TimeSystem, Dialog-System, +Unterricht/Gauntlet-Logik, echte Assets — das ist Phase 2 oder später. + +Vorgehen: kleine nachvollziehbare Schritte, kurz erklären was du tust, am Ende +committen (kein Push), knappe Test-Anleitung (Slide testen, Klettern an einer +konkreten Kante testen, alle drei Räume durchlaufen, Schlafsaal-Trigger prüfen, +Overlay-Werte checken), offene Punkte für Phase 2 auflisten. STOPP nach +Phase 1b und auf Review warten. Bei Unklarheiten in den Docs: nachfragen statt +raten. \ No newline at end of file diff --git a/scenes/hub/classroom.tscn b/scenes/hub/classroom.tscn new file mode 100644 index 0000000..b222418 --- /dev/null +++ b/scenes/hub/classroom.tscn @@ -0,0 +1,259 @@ +[gd_scene load_steps=26 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"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] +sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) +ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 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.4, 0.34, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_floor"] +size = Vector3(14, 1, 10) + +[sub_resource type="BoxMesh" id="BoxMesh_floor"] +material = SubResource("StandardMaterial3D_floor") +size = Vector3(14, 1, 10) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_structure"] +albedo_color = Color(0.5, 0.48, 0.45, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ns"] +size = Vector3(15, 3, 0.5) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ns"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(15, 3, 0.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ew"] +size = Vector3(0.5, 3, 11) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ew"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(0.5, 3, 11) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_desk"] +albedo_color = Color(0.55, 0.4, 0.25, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_desk"] +size = Vector3(1, 0.8, 0.6) + +[sub_resource type="BoxMesh" id="BoxMesh_desk"] +material = SubResource("StandardMaterial3D_desk") +size = Vector3(1, 0.8, 0.6) + +[sub_resource type="BoxShape3D" id="BoxShape3D_teacher_desk"] +size = Vector3(2.5, 1, 0.8) + +[sub_resource type="BoxMesh" id="BoxMesh_teacher_desk"] +material = SubResource("StandardMaterial3D_desk") +size = Vector3(2.5, 1, 0.8) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_trigger"] +transparency = 1 +albedo_color = Color(0.3, 0.8, 1, 0.35) + +[sub_resource type="BoxShape3D" id="BoxShape3D_door_s"] +size = Vector3(2, 2, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_door_s"] +material = SubResource("StandardMaterial3D_trigger") +size = Vector3(2, 2, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_door_w"] +size = Vector3(1, 2, 2) + +[sub_resource type="BoxMesh" id="BoxMesh_door_w"] +material = SubResource("StandardMaterial3D_trigger") +size = Vector3(1, 2, 2) + +[node name="Classroom" 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, 12, 0) +shadow_enabled = true + +[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, 1.5, -5.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, 1.5, 5.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, 7.25, 1.5, 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, -7.25, 1.5, 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="Desks" type="Node3D" parent="."] + +[node name="Desk1" type="StaticBody3D" parent="Desks"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0.4, 0.5) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Desks/Desk1"] +shape = SubResource("BoxShape3D_desk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Desks/Desk1"] +mesh = SubResource("BoxMesh_desk") + +[node name="Desk2" type="StaticBody3D" parent="Desks"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0.4, 0.5) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Desks/Desk2"] +shape = SubResource("BoxShape3D_desk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Desks/Desk2"] +mesh = SubResource("BoxMesh_desk") + +[node name="Desk3" type="StaticBody3D" parent="Desks"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 0.4, 0.5) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Desks/Desk3"] +shape = SubResource("BoxShape3D_desk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Desks/Desk3"] +mesh = SubResource("BoxMesh_desk") + +[node name="Desk4" type="StaticBody3D" parent="Desks"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0.4, 2.2) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Desks/Desk4"] +shape = SubResource("BoxShape3D_desk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Desks/Desk4"] +mesh = SubResource("BoxMesh_desk") + +[node name="Desk5" type="StaticBody3D" parent="Desks"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0.4, 2.2) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Desks/Desk5"] +shape = SubResource("BoxShape3D_desk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Desks/Desk5"] +mesh = SubResource("BoxMesh_desk") + +[node name="Desk6" type="StaticBody3D" parent="Desks"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 0.4, 2.2) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Desks/Desk6"] +shape = SubResource("BoxShape3D_desk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Desks/Desk6"] +mesh = SubResource("BoxMesh_desk") + +[node name="TeacherDesk" type="StaticBody3D" parent="Desks"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -3.5) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Desks/TeacherDesk"] +shape = SubResource("BoxShape3D_teacher_desk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Desks/TeacherDesk"] +mesh = SubResource("BoxMesh_teacher_desk") + +[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, 4.4) +collision_layer = 0 +collision_mask = 2 +script = ExtResource("4_zone") +target_scene_path = "res://scenes/hub/rider_quadrant.tscn" +target_spawn_name = "FromClassroom" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerRiderQuadrant"] +shape = SubResource("BoxShape3D_door_s") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerRiderQuadrant"] +mesh = SubResource("BoxMesh_door_s") + +[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 Reiterquadrant" +font_size = 40 +outline_size = 12 + +[node name="TriggerDormitory" 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/dormitory.tscn" +target_spawn_name = "FromClassroom" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerDormitory"] +shape = SubResource("BoxShape3D_door_w") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerDormitory"] +mesh = SubResource("BoxMesh_door_w") + +[node name="Label3D" type="Label3D" parent="Triggers/TriggerDormitory"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) +billboard = 1 +text = "Zum Schlafsaal" +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, 3.2) + +[node name="FromDormitory" type="Marker3D" parent="SpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.8, 0.1, 0) + +[node name="Player" parent="." instance=ExtResource("2_player")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 3.2) + +[node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] diff --git a/scenes/hub/dormitory.tscn b/scenes/hub/dormitory.tscn new file mode 100644 index 0000000..df2f981 --- /dev/null +++ b/scenes/hub/dormitory.tscn @@ -0,0 +1,256 @@ +[gd_scene load_steps=27 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/sleep_trigger.gd" id="5_sleep"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] +sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) +ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 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.4, 0.36, 0.32, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_floor"] +size = Vector3(14, 1, 10) + +[sub_resource type="BoxMesh" id="BoxMesh_floor"] +material = SubResource("StandardMaterial3D_floor") +size = Vector3(14, 1, 10) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_structure"] +albedo_color = Color(0.5, 0.48, 0.45, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ns"] +size = Vector3(15, 3, 0.5) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ns"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(15, 3, 0.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ew"] +size = Vector3(0.5, 3, 11) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ew"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(0.5, 3, 11) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bed"] +albedo_color = Color(0.35, 0.45, 0.6, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_bed"] +size = Vector3(1, 0.5, 2) + +[sub_resource type="BoxMesh" id="BoxMesh_bed"] +material = SubResource("StandardMaterial3D_bed") +size = Vector3(1, 0.5, 2) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_trigger"] +transparency = 1 +albedo_color = Color(0.3, 0.8, 1, 0.35) + +[sub_resource type="BoxShape3D" id="BoxShape3D_door_s"] +size = Vector3(2, 2, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_door_s"] +material = SubResource("StandardMaterial3D_trigger") +size = Vector3(2, 2, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_door_w"] +size = Vector3(1, 2, 2) + +[sub_resource type="BoxMesh" id="BoxMesh_door_w"] +material = SubResource("StandardMaterial3D_trigger") +size = Vector3(1, 2, 2) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sleep"] +transparency = 1 +albedo_color = Color(0.4, 1, 0.5, 0.3) + +[sub_resource type="BoxShape3D" id="BoxShape3D_sleep"] +size = Vector3(3, 2, 3) + +[sub_resource type="BoxMesh" id="BoxMesh_sleep"] +material = SubResource("StandardMaterial3D_sleep") +size = Vector3(3, 2, 3) + +[node name="Dormitory" 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, 12, 0) +shadow_enabled = true + +[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, 1.5, -5.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, 1.5, 5.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, 7.25, 1.5, 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, -7.25, 1.5, 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="Beds" type="Node3D" parent="."] + +[node name="Bed1" type="StaticBody3D" parent="Beds"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 0.25, -3.8) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Beds/Bed1"] +shape = SubResource("BoxShape3D_bed") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Beds/Bed1"] +mesh = SubResource("BoxMesh_bed") + +[node name="Bed2" type="StaticBody3D" parent="Beds"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0.25, -3.8) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Beds/Bed2"] +shape = SubResource("BoxShape3D_bed") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Beds/Bed2"] +mesh = SubResource("BoxMesh_bed") + +[node name="Bed3" type="StaticBody3D" parent="Beds"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5, 0.25, -3.8) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Beds/Bed3"] +shape = SubResource("BoxShape3D_bed") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Beds/Bed3"] +mesh = SubResource("BoxMesh_bed") + +[node name="Bed4" type="StaticBody3D" parent="Beds"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0.25, -3.8) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Beds/Bed4"] +shape = SubResource("BoxShape3D_bed") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Beds/Bed4"] +mesh = SubResource("BoxMesh_bed") + +[node name="SleepTrigger" type="Area3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1, -3.3) +collision_layer = 0 +collision_mask = 2 +script = ExtResource("5_sleep") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="SleepTrigger"] +shape = SubResource("BoxShape3D_sleep") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="SleepTrigger"] +mesh = SubResource("BoxMesh_sleep") + +[node name="Label3D" type="Label3D" parent="SleepTrigger"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) +billboard = 1 +text = "Schlafen — Tag beenden" +font_size = 40 +outline_size = 12 + +[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, 4.4) +collision_layer = 0 +collision_mask = 2 +script = ExtResource("4_zone") +target_scene_path = "res://scenes/hub/rider_quadrant.tscn" +target_spawn_name = "FromDormitory" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerRiderQuadrant"] +shape = SubResource("BoxShape3D_door_s") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerRiderQuadrant"] +mesh = SubResource("BoxMesh_door_s") + +[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 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) + +[node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] diff --git a/scenes/hub/rider_quadrant.tscn b/scenes/hub/rider_quadrant.tscn new file mode 100644 index 0000000..0d95102 --- /dev/null +++ b/scenes/hub/rider_quadrant.tscn @@ -0,0 +1,249 @@ +[gd_scene load_steps=26 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/npc_placeholder.gd" id="4_imogen"] +[ext_resource type="Script" path="res://scripts/gameplay/zone_trigger.gd" id="5_zone"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] +sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) +ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 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_ground"] +albedo_color = Color(0.36, 0.4, 0.36, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_ground"] +size = Vector3(40, 1, 40) + +[sub_resource type="BoxMesh" id="BoxMesh_ground"] +material = SubResource("StandardMaterial3D_ground") +size = Vector3(40, 1, 40) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_structure"] +albedo_color = Color(0.55, 0.45, 0.35, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ns"] +size = Vector3(42, 3, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ns"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(42, 3, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wall_ew"] +size = Vector3(1, 3, 42) + +[sub_resource type="BoxMesh" id="BoxMesh_wall_ew"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(1, 3, 42) + +[sub_resource type="BoxShape3D" id="BoxShape3D_cube_small"] +size = Vector3(2, 2, 2) + +[sub_resource type="BoxMesh" id="BoxMesh_cube_small"] +material = SubResource("StandardMaterial3D_structure") +size = Vector3(2, 2, 2) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_imogen"] +albedo_color = Color(0.85, 0.35, 0.5, 1) + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_imogen"] +material = SubResource("StandardMaterial3D_imogen") +radius = 0.4 +height = 1.8 + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_npc"] +radius = 0.4 +height = 1.8 + +[sub_resource type="SphereShape3D" id="SphereShape3D_interact"] +radius = 2.5 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_trigger"] +transparency = 1 +albedo_color = Color(0.3, 0.8, 1, 0.35) + +[sub_resource type="BoxShape3D" id="BoxShape3D_trigger"] +size = Vector3(2, 2, 2) + +[sub_resource type="BoxMesh" id="BoxMesh_trigger"] +material = SubResource("StandardMaterial3D_trigger") +size = Vector3(2, 2, 2) + +[node name="RiderQuadrant" 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, 12, 0) +shadow_enabled = true + +[node name="Ground" type="StaticBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Ground"] +shape = SubResource("BoxShape3D_ground") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Ground"] +mesh = SubResource("BoxMesh_ground") + +[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, 1.5, -20.5) + +[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, 1.5, 20.5) + +[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, 20.5, 1.5, 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, -20.5, 1.5, 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="ClimbBoxes" type="Node3D" parent="."] + +[node name="BoxA" type="StaticBody3D" parent="ClimbBoxes"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 1, 2) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbBoxes/BoxA"] +shape = SubResource("BoxShape3D_cube_small") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbBoxes/BoxA"] +mesh = SubResource("BoxMesh_cube_small") + +[node name="BoxB" type="StaticBody3D" parent="ClimbBoxes"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 1, -6) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbBoxes/BoxB"] +shape = SubResource("BoxShape3D_cube_small") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbBoxes/BoxB"] +mesh = SubResource("BoxMesh_cube_small") + +[node name="Imogen" type="StaticBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0, 4) +script = ExtResource("4_imogen") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Imogen"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) +shape = SubResource("CapsuleShape3D_npc") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Imogen"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) +mesh = SubResource("CapsuleMesh_imogen") + +[node name="NameLabel" type="Label3D" parent="Imogen"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.2, 0) +billboard = 1 +text = "Imogen" +font_size = 64 +outline_size = 16 + +[node name="PromptLabel" type="Label3D" parent="Imogen"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0) +visible = false +modulate = Color(1, 0.9, 0.5, 1) +billboard = 1 +text = "E / (A) — Reden" +font_size = 40 +outline_size = 12 + +[node name="InteractionArea" type="Area3D" parent="Imogen"] +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Imogen/InteractionArea"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) +shape = SubResource("SphereShape3D_interact") + +[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) +collision_layer = 0 +collision_mask = 2 +script = ExtResource("5_zone") +target_scene_path = "res://scenes/hub/dormitory.tscn" +target_spawn_name = "FromRiderQuadrant" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerDormitory"] +shape = SubResource("BoxShape3D_trigger") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerDormitory"] +mesh = SubResource("BoxMesh_trigger") + +[node name="Label3D" type="Label3D" parent="Triggers/TriggerDormitory"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) +billboard = 1 +text = "Zum Schlafsaal" +font_size = 48 +outline_size = 12 + +[node name="TriggerClassroom" type="Area3D" parent="Triggers"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1, -19) +collision_layer = 0 +collision_mask = 2 +script = ExtResource("5_zone") +target_scene_path = "res://scenes/hub/classroom.tscn" +target_spawn_name = "FromRiderQuadrant" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Triggers/TriggerClassroom"] +shape = SubResource("BoxShape3D_trigger") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Triggers/TriggerClassroom"] +mesh = SubResource("BoxMesh_trigger") + +[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 = 48 +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) + +[node name="Player" parent="." instance=ExtResource("2_player")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 8) + +[node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] diff --git a/scenes/player.tscn b/scenes/player.tscn new file mode 100644 index 0000000..af5c89e --- /dev/null +++ b/scenes/player.tscn @@ -0,0 +1,39 @@ +[gd_scene load_steps=5 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/player.gd" id="1_player"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_player"] +albedo_color = Color(0.3, 0.5, 0.85, 1) + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_player"] +radius = 0.4 +height = 1.8 + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_player"] +material = SubResource("StandardMaterial3D_player") +radius = 0.4 +height = 1.8 + +[node name="Player" type="CharacterBody3D" groups=["player"]] +collision_layer = 2 +collision_mask = 1 +script = ExtResource("1_player") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) +shape = SubResource("CapsuleShape3D_player") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) +mesh = SubResource("CapsuleMesh_player") + +[node name="CameraPivot" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) + +[node name="SpringArm3D" type="SpringArm3D" parent="CameraPivot"] +transform = Transform3D(1, 0, 0, 0, 0.939693, 0.34202, 0, -0.34202, 0.939693, 0, 0, 0) +spring_length = 9.0 +margin = 0.25 + +[node name="Camera3D" type="Camera3D" parent="CameraPivot/SpringArm3D"] +current = true diff --git a/scenes/test_ground.tscn b/scenes/test_ground.tscn index de31e17..2bd1082 100644 --- a/scenes/test_ground.tscn +++ b/scenes/test_ground.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=24 format=3] +[gd_scene load_steps=17 format=3] -[ext_resource type="Script" path="res://scripts/gameplay/player.gd" id="1_player"] -[ext_resource type="Script" path="res://scripts/ui/debug_overlay.gd" id="2_debug"] -[ext_resource type="Script" path="res://scripts/gameplay/test_ground.gd" id="3_ground"] -[ext_resource type="Script" path="res://scripts/gameplay/npc_placeholder.gd" id="4_imogen"] +[ext_resource type="Script" path="res://scripts/gameplay/test_ground.gd" id="1_ground"] +[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"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) @@ -51,31 +50,8 @@ size = Vector3(8, 2, 1) material = SubResource("StandardMaterial3D_obstacle") size = Vector3(8, 2, 1) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_player"] -albedo_color = Color(0.3, 0.5, 0.85, 1) - -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_player"] -radius = 0.4 -height = 1.8 - -[sub_resource type="CapsuleMesh" id="CapsuleMesh_player"] -material = SubResource("StandardMaterial3D_player") -radius = 0.4 -height = 1.8 - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_imogen"] -albedo_color = Color(0.85, 0.35, 0.5, 1) - -[sub_resource type="CapsuleMesh" id="CapsuleMesh_imogen"] -material = SubResource("StandardMaterial3D_imogen") -radius = 0.4 -height = 1.8 - -[sub_resource type="SphereShape3D" id="SphereShape3D_interact"] -radius = 2.5 - [node name="TestGround" type="Node3D"] -script = ExtResource("3_ground") +script = ExtResource("1_ground") [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_env") @@ -140,75 +116,7 @@ shape = SubResource("BoxShape3D_wall") [node name="MeshInstance3D" type="MeshInstance3D" parent="Obstacles/Wall"] mesh = SubResource("BoxMesh_wall") -[node name="Player" type="CharacterBody3D" parent="."] +[node name="Player" parent="." instance=ExtResource("2_player")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 6) -collision_layer = 2 -collision_mask = 1 -script = ExtResource("1_player") -[node name="CollisionShape3D" type="CollisionShape3D" parent="Player"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) -shape = SubResource("CapsuleShape3D_player") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="Player"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) -mesh = SubResource("CapsuleMesh_player") - -[node name="CameraPivot" type="Node3D" parent="Player"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) - -[node name="SpringArm3D" type="SpringArm3D" parent="Player/CameraPivot"] -transform = Transform3D(1, 0, 0, 0, 0.939693, 0.34202, 0, -0.34202, 0.939693, 0, 0, 0) -spring_length = 9.0 -margin = 0.25 - -[node name="Camera3D" type="Camera3D" parent="Player/CameraPivot/SpringArm3D"] - -[node name="Imogen" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, 2) -script = ExtResource("4_imogen") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Imogen"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) -shape = SubResource("CapsuleShape3D_player") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="Imogen"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) -mesh = SubResource("CapsuleMesh_imogen") - -[node name="NameLabel" type="Label3D" parent="Imogen"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.2, 0) -billboard = 1 -text = "Imogen" -font_size = 64 -outline_size = 16 - -[node name="PromptLabel" type="Label3D" parent="Imogen"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0) -visible = false -modulate = Color(1, 0.9, 0.5, 1) -billboard = 1 -text = "E / (A) — Reden" -font_size = 40 -outline_size = 12 - -[node name="InteractionArea" type="Area3D" parent="Imogen"] -collision_layer = 0 -collision_mask = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Imogen/InteractionArea"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) -shape = SubResource("SphereShape3D_interact") - -[node name="DebugOverlay" type="CanvasLayer" parent="."] -script = ExtResource("2_debug") -player_path = NodePath("../Player") - -[node name="InfoLabel" type="Label" parent="DebugOverlay"] -offset_left = 12.0 -offset_top = 8.0 -offset_right = 460.0 -offset_bottom = 240.0 -theme_override_colors/font_color = Color(1, 1, 1, 1) -theme_override_colors/font_outline_color = Color(0, 0, 0, 1) -theme_override_constants/outline_size = 4 +[node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] diff --git a/scenes/ui/debug_overlay.tscn b/scenes/ui/debug_overlay.tscn new file mode 100644 index 0000000..1603a1d --- /dev/null +++ b/scenes/ui/debug_overlay.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/ui/debug_overlay.gd" id="1_debug"] + +[node name="DebugOverlay" type="CanvasLayer"] +script = ExtResource("1_debug") + +[node name="InfoLabel" type="Label" parent="."] +offset_left = 12.0 +offset_top = 8.0 +offset_right = 460.0 +offset_bottom = 280.0 +theme_override_colors/font_color = Color(1, 1, 1, 1) +theme_override_colors/font_outline_color = Color(0, 0, 0, 1) +theme_override_constants/outline_size = 4 diff --git a/scripts/autoloads/time_system.gd b/scripts/autoloads/time_system.gd index 2a65e1f..8e8af48 100644 --- a/scripts/autoloads/time_system.gd +++ b/scripts/autoloads/time_system.gd @@ -1,6 +1,61 @@ extends Node ## Tageszyklus (Autoload, SPEC.md Abschnitte 6 und 8). ## -## Verwaltet ab Phase 1 die Tages-Slots Vormittag/Nachmittag/Abend über die -## 3-4 spielbaren Tage des v1-Loops; der Schlafsaal beendet den Tag. -## Phase 0: leeres Skelett ohne Logik. +## Verwaltet die Tages-Slots Vormittag/Nachmittag/Abend und den +## Tageszähler. advance_slot() rückt bis zum Abend vor; den Tag beendet +## laut SPEC ausschließlich der Schlafsaal über end_day(), das auf den +## Vormittag des Folgetags springt. Zustand ist in Phase 1b bewusst nur +## In-Memory — die Save/Load-Anbindung folgt, sobald der Zustand feststeht. + +signal slot_changed(new_slot: DaySlot) +signal day_ended(new_day: int) + +enum DaySlot { MORNING, AFTERNOON, EVENING } + +const SLOT_NAMES := { + DaySlot.MORNING: "Vormittag", + DaySlot.AFTERNOON: "Nachmittag", + DaySlot.EVENING: "Abend", +} + +var current_slot := DaySlot.MORNING +var day_count := 1 + + +## Setzt den Zyklus auf Tag 1, Vormittag zurück (neues Spiel). +func reset() -> void: + day_count = 1 + _change_slot(DaySlot.MORNING) + + +## Rückt auf den nächsten Tages-Slot vor. Vom Abend aus passiert nichts — +## den Tag beendet ausschließlich der Schlafsaal (end_day()). +func advance_slot() -> void: + match current_slot: + DaySlot.MORNING: + _change_slot(DaySlot.AFTERNOON) + DaySlot.AFTERNOON: + _change_slot(DaySlot.EVENING) + DaySlot.EVENING: + push_warning("advance_slot() am Abend ignoriert — Tag endet nur im Schlafsaal.") + + +## Beendet den Tag über den Schlafsaal-Trigger: erhöht den Tageszähler und +## springt zurück auf den Vormittag. +func end_day() -> void: + day_count += 1 + day_ended.emit(day_count) + _change_slot(DaySlot.MORNING) + + +## Liefert den deutschen Anzeigenamen des aktuellen Slots. +func get_slot_name() -> String: + return SLOT_NAMES[current_slot] + + +## Setzt den Slot und meldet echte Wechsel über slot_changed. +func _change_slot(new_slot: DaySlot) -> void: + if new_slot == current_slot: + return + current_slot = new_slot + slot_changed.emit(current_slot) diff --git a/scripts/gameplay/hub_room.gd b/scripts/gameplay/hub_room.gd new file mode 100644 index 0000000..3fb1590 --- /dev/null +++ b/scripts/gameplay/hub_room.gd @@ -0,0 +1,30 @@ +extends Node3D +## Gemeinsame Ablauf-Steuerung der Greybox-Hub-Räume (Phase 1b). +## +## Platziert den Spieler nach einem Zonen-Wechsel am vom ZoneTrigger +## angeforderten Spawn-Punkt (Kind des SpawnPoints-Nodes, benannt nach dem +## Herkunfts-Raum), damit niemand im Boden oder in einem Trigger spawnt. +## Interims-Lösung wie in der Testszene, bis eine echte Menü-Führung +## existiert: Die menu-Action speichert und kehrt ins Hauptmenü zurück. + +const MAIN_MENU_SCENE := "res://scenes/ui/main_menu.tscn" + + +## Setzt den Spieler auf den vom Zonen-Wechsel angeforderten Spawn-Punkt. +func _ready() -> void: + var spawn_name := ZoneTrigger.consume_pending_spawn() + if spawn_name.is_empty(): + return + var spawn := get_node_or_null("SpawnPoints/%s" % spawn_name) as Node3D + var player := get_tree().get_first_node_in_group("player") as Node3D + if spawn == null or player == null: + push_warning("Spawn-Punkt '%s' oder Spieler nicht gefunden." % spawn_name) + return + player.global_position = spawn.global_position + + +## Speichert bei menu und wechselt zurück ins Hauptmenü. +func _unhandled_input(event: InputEvent) -> void: + if event.is_action_pressed("menu"): + SaveSystem.save_game() + get_tree().change_scene_to_file(MAIN_MENU_SCENE) diff --git a/scripts/gameplay/hub_room.gd.uid b/scripts/gameplay/hub_room.gd.uid new file mode 100644 index 0000000..777d80d --- /dev/null +++ b/scripts/gameplay/hub_room.gd.uid @@ -0,0 +1 @@ +uid://dwlc24sc8fr1c diff --git a/scripts/gameplay/player.gd b/scripts/gameplay/player.gd index 43ae281..60d9a8a 100644 --- a/scripts/gameplay/player.gd +++ b/scripts/gameplay/player.gd @@ -1,17 +1,25 @@ extends CharacterBody3D -## Greybox-Spielersteuerung für Phase 0. +## Greybox-Spielersteuerung (Phase 0 + Movement-Upgrade Phase 1b). ## -## Bewegt die Spieler-Kapsel relativ zur Kamera (WASD + linker Stick), -## unterstützt Sprint und steuert die weit rausgezoomte Third-Person-Kamera -## im WoW-Stil: Orbit über Maus und rechten Stick, Zoom über Mausrad und -## Schultertasten, Kollision über SpringArm3D. Die Actions look_x/look_y -## sind in der Input-Map registriert; Mausbewegung ist in Godot nicht auf -## Actions mappbar und wird deshalb direkt als InputEventMouseMotion -## gelesen, der rechte Stick direkt über die Joypad-Achsen (Deadzone 0.2). +## Bewegt die Spieler-Kapsel relativ zur Kamera (WASD + linker Stick) mit +## Sprint und Sprung, dazu die weit rausgezoomte Third-Person-Kamera im +## WoW-Stil über SpringArm3D (Orbit: Maus + rechter Stick, Zoom: Mausrad + +## Schultertasten). Phase 1b ergänzt eine Zustandsmaschine: Slide (kurzer, +## geschwindigkeitsabhängiger Rutsch-Impuls mit reduzierter Kapselhöhe über +## die slide-Action) und automatisches Hochziehen an Kanten unterhalb einer +## Maximalhöhe, wenn der Spieler im Sprung gegen eine Wand stößt (einfache +## Kantenerkennung per Raycast). Die Kapsel-Shape wird beim Start +## dupliziert, damit Größenänderungen keine NPC-Kapseln mit geteilter +## Ressource betreffen. Mausbewegung ist in Godot nicht auf Actions mappbar +## und wird direkt als InputEventMouseMotion gelesen, der rechte Stick +## direkt über die Joypad-Achsen (Deadzone 0.2). + +enum MovementState { NORMAL, SLIDING, CLIMBING } const WALK_SPEED := 4.0 const SPRINT_SPEED := 7.5 const STOP_SPEED := 16.0 +const JUMP_SPEED := 4.5 const MESH_TURN_SPEED := 10.0 const MOUSE_SENSITIVITY := 0.003 const STICK_LOOK_SPEED := 2.5 @@ -23,20 +31,46 @@ const ZOOM_MAX := 14.0 const ZOOM_STEP := 0.8 const ZOOM_BUTTON_SPEED := 8.0 const ZOOM_SMOOTHING := 10.0 +const SLIDE_MIN_ENTRY_SPEED := 2.0 +const SLIDE_MIN_SPEED := 6.0 +const SLIDE_SPEED_BOOST := 1.35 +const SLIDE_DURATION := 0.7 +const SLIDE_CAPSULE_HEIGHT := 1.0 +const SLIDE_MESH_SQUASH := 0.55 +const STAND_CAPSULE_HEIGHT := 1.8 +const CLIMB_MIN_LEDGE_HEIGHT := 0.4 +const CLIMB_MAX_LEDGE_HEIGHT := 2.2 +const CLIMB_PROBE_MARGIN := 0.3 +const CLIMB_FORWARD_PROBE := 0.5 +const CLIMB_LANDING_INSET := 0.35 +const CLIMB_HEADROOM := 1.7 +const CLIMB_DURATION := 0.4 +const CLIMB_VERTICAL_PHASE := 0.6 +var _state := MovementState.NORMAL var _target_zoom := 9.0 var _gravity: float = ProjectSettings.get_setting("physics/3d/default_gravity") +var _slide_direction := Vector3.ZERO +var _slide_start_speed := 0.0 +var _slide_time := 0.0 +var _climb_start := Vector3.ZERO +var _climb_corner := Vector3.ZERO +var _climb_target := Vector3.ZERO +var _climb_time := 0.0 @onready var _camera_pivot: Node3D = $CameraPivot @onready var _spring_arm: SpringArm3D = $CameraPivot/SpringArm3D @onready var _mesh: MeshInstance3D = $MeshInstance3D +@onready var _collision_shape: CollisionShape3D = $CollisionShape3D +@onready var _capsule: CapsuleShape3D = _collision_shape.shape.duplicate() -## Fängt den Mauszeiger ein und übernimmt die im Editor gesetzte -## SpringArm-Länge als Zoom-Ziel. +## Fängt den Mauszeiger ein, übernimmt die SpringArm-Länge als Zoom-Ziel +## und gibt dem Spieler eine eigene Kapsel-Shape-Instanz. func _ready() -> void: Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) _target_zoom = _spring_arm.spring_length + _collision_shape.shape = _capsule ## Verarbeitet Maus-Look, Mausrad-Zoom sowie das Freigeben des Cursors über @@ -55,13 +89,18 @@ func _unhandled_input(event: InputEvent) -> void: Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) -## Treibt pro Physik-Tick Stick-Look, Schultertasten-Zoom, Zoom-Glättung und -## Bewegung an. +## Treibt Kamera und den aktiven Bewegungszustand pro Physik-Tick an. func _physics_process(delta: float) -> void: _apply_stick_look(delta) _apply_button_zoom(delta) _apply_zoom_smoothing(delta) - _apply_movement(delta) + match _state: + MovementState.NORMAL: + _process_normal(delta) + MovementState.SLIDING: + _process_slide(delta) + MovementState.CLIMBING: + _process_climb(delta) ## Liefert die aktuelle Kamera-Distanz in Metern für das Debug-Overlay. @@ -69,6 +108,130 @@ func get_camera_zoom() -> float: return _spring_arm.spring_length +## Liefert den Namen des aktiven Bewegungszustands für Debug-Zwecke. +func get_movement_state_name() -> String: + return MovementState.keys()[_state] + + +## Normale Bewegung: Schwerkraft, kamerarelatives Laufen mit Sprint und +## Sprung, danach Slide-Einstieg und Kletter-Kantenerkennung prüfen. +func _process_normal(delta: float) -> void: + if not is_on_floor(): + velocity.y -= _gravity * delta + elif Input.is_action_just_pressed("jump"): + velocity.y = JUMP_SPEED + var input_dir := Input.get_vector("move_left", "move_right", "move_forward", "move_back") + var direction := _camera_pivot.global_transform.basis * Vector3(input_dir.x, 0.0, input_dir.y) + direction.y = 0.0 + var speed := SPRINT_SPEED if Input.is_action_pressed("sprint") else WALK_SPEED + if direction.length_squared() > 0.0: + velocity.x = direction.x * speed + velocity.z = direction.z * speed + var target_yaw := atan2(-direction.x, -direction.z) + _mesh.rotation.y = lerp_angle(_mesh.rotation.y, target_yaw, minf(MESH_TURN_SPEED * delta, 1.0)) + else: + velocity.x = move_toward(velocity.x, 0.0, STOP_SPEED * delta) + velocity.z = move_toward(velocity.z, 0.0, STOP_SPEED * delta) + move_and_slide() + if is_on_floor() and Input.is_action_just_pressed("slide"): + _try_start_slide() + elif not is_on_floor() and is_on_wall() and direction.length_squared() > 0.0: + _try_start_climb(direction.normalized()) + + +## Startet den Slide, wenn genug horizontale Geschwindigkeit vorhanden ist: +## Impuls in Bewegungsrichtung proportional zur aktuellen Geschwindigkeit, +## Kapsel- und Mesh-Höhe reduziert. Kein Slide im Stand. +func _try_start_slide() -> void: + var horizontal := Vector3(velocity.x, 0.0, velocity.z) + if horizontal.length() < SLIDE_MIN_ENTRY_SPEED: + return + _slide_direction = horizontal.normalized() + _slide_start_speed = maxf(horizontal.length() * SLIDE_SPEED_BOOST, SLIDE_MIN_SPEED) + _slide_time = 0.0 + _apply_body_height(SLIDE_CAPSULE_HEIGHT, SLIDE_MESH_SQUASH) + _state = MovementState.SLIDING + + +## Slide-Verlauf: Geschwindigkeit fällt über SLIDE_DURATION auf Gehtempo, +## dann Rückkehr in den normalen Zustand. Wände beenden den Slide sofort. +func _process_slide(delta: float) -> void: + _slide_time += delta + var progress := clampf(_slide_time / SLIDE_DURATION, 0.0, 1.0) + var speed := lerpf(_slide_start_speed, WALK_SPEED, progress) + velocity.x = _slide_direction.x * speed + velocity.z = _slide_direction.z * speed + if not is_on_floor(): + velocity.y -= _gravity * delta + move_and_slide() + if progress >= 1.0 or is_on_wall(): + _end_slide() + + +## Beendet den Slide und stellt Kapsel- und Mesh-Höhe wieder her. +func _end_slide() -> void: + _apply_body_height(STAND_CAPSULE_HEIGHT, 1.0) + _state = MovementState.NORMAL + + +## Setzt Kapselhöhe und Mesh-Stauchung gemeinsam und hält dabei beide +## Unterkanten auf Bodenniveau, indem die Mittelpunkte mitwandern. +func _apply_body_height(capsule_height: float, mesh_scale: float) -> void: + _capsule.height = capsule_height + _collision_shape.position.y = capsule_height / 2.0 + _mesh.scale.y = mesh_scale + _mesh.position.y = STAND_CAPSULE_HEIGHT / 2.0 * mesh_scale + + +## Prüft im Sprung per Raycast, ob vor dem Spieler eine Kante unterhalb der +## Maximalhöhe mit freiem Platz darüber liegt, und startet das Hochziehen. +## move_direction ist die horizontale Bewegungsrichtung des Spielers. +func _try_start_climb(move_direction: Vector3) -> void: + var wall_normal := get_wall_normal() + wall_normal.y = 0.0 + if wall_normal.length_squared() < 0.5: + return + wall_normal = wall_normal.normalized() + if move_direction.dot(-wall_normal) < 0.3: + return + var into_wall := -wall_normal + var space := get_world_3d().direct_space_state + var probe_top := global_position + Vector3.UP * (CLIMB_MAX_LEDGE_HEIGHT + CLIMB_PROBE_MARGIN) + into_wall * CLIMB_FORWARD_PROBE + var ledge_query := PhysicsRayQueryParameters3D.create(probe_top, probe_top + Vector3.DOWN * CLIMB_MAX_LEDGE_HEIGHT, collision_mask, [get_rid()]) + var ledge_hit := space.intersect_ray(ledge_query) + if ledge_hit.is_empty(): + return + var ledge_height: float = ledge_hit["position"].y - global_position.y + if ledge_height < CLIMB_MIN_LEDGE_HEIGHT or ledge_height > CLIMB_MAX_LEDGE_HEIGHT: + return + var landing: Vector3 = ledge_hit["position"] + into_wall * CLIMB_LANDING_INSET + landing.y = ledge_hit["position"].y + 0.05 + var headroom_query := PhysicsRayQueryParameters3D.create(landing + Vector3.UP * 0.1, landing + Vector3.UP * CLIMB_HEADROOM, collision_mask, [get_rid()]) + if not space.intersect_ray(headroom_query).is_empty(): + return + _climb_start = global_position + _climb_corner = Vector3(global_position.x, landing.y, global_position.z) + _climb_target = landing + _climb_time = 0.0 + velocity = Vector3.ZERO + _state = MovementState.CLIMBING + + +## Kletter-Verlauf in zwei Phasen: erst senkrecht auf Kantenhöhe, dann +## horizontal auf die Kante, anschließend zurück in normale Bewegung. +func _process_climb(delta: float) -> void: + _climb_time += delta + var progress := clampf(_climb_time / CLIMB_DURATION, 0.0, 1.0) + if progress < CLIMB_VERTICAL_PHASE: + global_position = _climb_start.lerp(_climb_corner, progress / CLIMB_VERTICAL_PHASE) + else: + var lateral := (progress - CLIMB_VERTICAL_PHASE) / (1.0 - CLIMB_VERTICAL_PHASE) + global_position = _climb_corner.lerp(_climb_target, lateral) + if progress >= 1.0: + velocity = Vector3.ZERO + _state = MovementState.NORMAL + + ## Dreht die Kamera um yaw_delta (horizontal, am Pivot) und pitch_delta ## (vertikal, am SpringArm, begrenzt auf PITCH_MIN..PITCH_MAX). Beide Werte ## in Radiant. @@ -100,26 +263,6 @@ func _apply_zoom_smoothing(delta: float) -> void: _spring_arm.spring_length = lerpf(_spring_arm.spring_length, _target_zoom, minf(ZOOM_SMOOTHING * delta, 1.0)) -## Wendet Schwerkraft an, bewegt den Spieler kamerarelativ mit Geh- oder -## Sprint-Tempo und dreht das Kapsel-Mesh weich in Laufrichtung. -func _apply_movement(delta: float) -> void: - if not is_on_floor(): - velocity.y -= _gravity * delta - var input_dir := Input.get_vector("move_left", "move_right", "move_forward", "move_back") - var direction := _camera_pivot.global_transform.basis * Vector3(input_dir.x, 0.0, input_dir.y) - direction.y = 0.0 - var speed := SPRINT_SPEED if Input.is_action_pressed("sprint") else WALK_SPEED - if direction.length_squared() > 0.0: - velocity.x = direction.x * speed - velocity.z = direction.z * speed - var target_yaw := atan2(-direction.x, -direction.z) - _mesh.rotation.y = lerp_angle(_mesh.rotation.y, target_yaw, minf(MESH_TURN_SPEED * delta, 1.0)) - else: - velocity.x = move_toward(velocity.x, 0.0, STOP_SPEED * delta) - velocity.z = move_toward(velocity.z, 0.0, STOP_SPEED * delta) - move_and_slide() - - ## Liest eine Joypad-Achse über alle verbundenen Controller und liefert den ## ersten Wert außerhalb der Deadzone, sonst 0. func _read_joy_axis(axis: JoyAxis) -> float: diff --git a/scripts/gameplay/sleep_trigger.gd b/scripts/gameplay/sleep_trigger.gd new file mode 100644 index 0000000..9ccdc33 --- /dev/null +++ b/scripts/gameplay/sleep_trigger.gd @@ -0,0 +1,20 @@ +extends Area3D +## Schlafsaal-Trigger (Phase 1b, SPEC.md Abschnitt 6). +## +## Beendet beim Betreten durch den Spieler den Tag über +## TimeSystem.end_day(): Tageszähler steigt, der Slot springt zurück auf +## den Vormittag. Rückmeldung vorerst über die Konsole und das +## Debug-Overlay; eine Schlaf-Sequenz mit UI folgt in einer späteren Phase. + + +## Verbindet das Betreten-Signal des Triggers. +func _ready() -> void: + body_entered.connect(_on_body_entered) + + +## Beendet den Tag, sobald der Spieler den Schlafbereich betritt. +func _on_body_entered(body: Node3D) -> void: + if not body.is_in_group("player"): + return + TimeSystem.end_day() + print("Geschlafen — Tag %d, %s." % [TimeSystem.day_count, TimeSystem.get_slot_name()]) diff --git a/scripts/gameplay/sleep_trigger.gd.uid b/scripts/gameplay/sleep_trigger.gd.uid new file mode 100644 index 0000000..e2e62f1 --- /dev/null +++ b/scripts/gameplay/sleep_trigger.gd.uid @@ -0,0 +1 @@ +uid://pdxovwwycsja diff --git a/scripts/gameplay/zone_trigger.gd b/scripts/gameplay/zone_trigger.gd new file mode 100644 index 0000000..558c5c5 --- /dev/null +++ b/scripts/gameplay/zone_trigger.gd @@ -0,0 +1,35 @@ +class_name ZoneTrigger +extends Area3D +## Zonen-Wechsel-Trigger zwischen den Greybox-Hub-Räumen (Phase 1b). +## +## Lädt beim Betreten durch den Spieler die Zielszene und merkt sich +## statisch den Namen des Spawn-Punkts, an dem der Ziel-Raum den Spieler +## platziert (hub_room.gd liest ihn über consume_pending_spawn()). Der +## Szenenwechsel läuft deferred, weil body_entered während des +## Physik-Schritts feuert. + +static var _pending_spawn_name := "" + +@export_file("*.tscn") var target_scene_path: String +@export var target_spawn_name: String + + +## Liefert den gemerkten Spawn-Punkt-Namen des letzten Zonen-Wechsels und +## leert ihn dabei; leerer String, wenn kein Wechsel ansteht. +static func consume_pending_spawn() -> String: + var spawn_name := _pending_spawn_name + _pending_spawn_name = "" + return spawn_name + + +## Verbindet das Betreten-Signal des Triggers. +func _ready() -> void: + body_entered.connect(_on_body_entered) + + +## Startet den Zonen-Wechsel, sobald der Spieler den Trigger betritt. +func _on_body_entered(body: Node3D) -> void: + if not body.is_in_group("player"): + return + _pending_spawn_name = target_spawn_name + get_tree().change_scene_to_file.call_deferred(target_scene_path) diff --git a/scripts/gameplay/zone_trigger.gd.uid b/scripts/gameplay/zone_trigger.gd.uid new file mode 100644 index 0000000..69f18e7 --- /dev/null +++ b/scripts/gameplay/zone_trigger.gd.uid @@ -0,0 +1 @@ +uid://bmth1sjrdqrbb diff --git a/scripts/ui/debug_overlay.gd b/scripts/ui/debug_overlay.gd index 1daf054..ef97696 100644 --- a/scripts/ui/debug_overlay.gd +++ b/scripts/ui/debug_overlay.gd @@ -2,9 +2,11 @@ extends CanvasLayer ## Debug-Overlay für Phase 0. ## ## Zeigt FPS, das zuletzt benutzte Eingabegerät (Tastatur/Maus, Xbox- oder -## PS5-Controller), die Spielerposition, die aktuelle Kamera-Distanz sowie -## seit Phase 1a die GameState-Werte: Stats, Klinge-↔-Herz-Ton-Wert, -## Beziehungswert zu Imogen und Permadeath-Status. Der verdeckte +## PS5-Controller), die Spielerposition, die aktuelle Kamera-Distanz, den +## Bewegungszustand sowie seit Phase 1b Tages-Slot und Tageszähler aus dem +## TimeSystem und seit Phase 1a die GameState-Werte: Stats, +## Klinge-↔-Herz-Ton-Wert, Beziehungswert zu Imogen und Permadeath-Status. +## Der verdeckte ## Menschlichkeits-Messwert wird laut SPEC bewusst NICHT angezeigt. ## Die provisorische Geräteerkennung wandert in einer späteren Phase in das ## Autoload InputPrompts (dynamische Button-Prompts, SPEC.md Abschnitt 2). @@ -23,9 +25,13 @@ var _player: CharacterBody3D @onready var _info_label: Label = $InfoLabel -## Löst die Spieler-Referenz aus dem exportierten Pfad auf. +## Löst die Spieler-Referenz auf: bevorzugt über den exportierten Pfad, +## sonst über die Gruppe "player" (Standard seit der Szenen-Extraktion in +## Phase 1b). func _ready() -> void: _player = get_node_or_null(player_path) as CharacterBody3D + if _player == null: + _player = get_tree().get_first_node_in_group("player") as CharacterBody3D ## Merkt sich das zuletzt benutzte Eingabegerät anhand des Event-Typs; @@ -49,6 +55,9 @@ func _process(_delta: float) -> void: lines.append("Position: (%.1f, %.1f, %.1f)" % [pos.x, pos.y, pos.z]) if _player.has_method("get_camera_zoom"): lines.append("Kamera-Zoom: %.1f m" % _player.get_camera_zoom()) + if _player.has_method("get_movement_state_name"): + lines.append("Bewegung: %s" % _player.get_movement_state_name()) + lines.append("Tag %d — %s" % [TimeSystem.day_count, TimeSystem.get_slot_name()]) lines.append("Kraft: %d Schnelligkeit: %d Verstand: %d" % [GameState.strength, GameState.agility, GameState.intellect]) lines.append("Klinge <-> Herz: %+d" % GameState.blade_heart_tone) lines.append("Beziehung Imogen: %+d" % RelationshipSystem.get_relationship(IMOGEN_NPC_ID)) diff --git a/scripts/ui/main_menu.gd b/scripts/ui/main_menu.gd index 965e22e..5fa066b 100644 --- a/scripts/ui/main_menu.gd +++ b/scripts/ui/main_menu.gd @@ -10,7 +10,7 @@ extends Control ## auf den Beenden-Button. Die Aktivierung läuft explizit über die ## Input-Map-Action confirm und hängt nicht an Godots internem ui_accept. -const GAME_SCENE := "res://scenes/test_ground.tscn" +const GAME_SCENE := "res://scenes/hub/rider_quadrant.tscn" @onready var _start_button: Button = $CenterContainer/VBoxContainer/StartButton @onready var _continue_button: Button = $CenterContainer/VBoxContainer/ContinueButton @@ -55,9 +55,11 @@ func _handle_confirm(event: InputEvent) -> void: button.pressed.emit() -## Startet ein neues Spiel mit frisch zurückgesetztem GameState. +## Startet ein neues Spiel mit frisch zurückgesetztem GameState und +## Tageszyklus. func _on_start_pressed() -> void: GameState.reset() + TimeSystem.reset() get_tree().change_scene_to_file(GAME_SCENE)