From 6f92fc0ae067715c508fa00a91fde26d714b3a32 Mon Sep 17 00:00:00 2001 From: danny Date: Thu, 9 Jul 2026 07:28:11 +0200 Subject: [PATCH] CR-002/CR-003: Gauntlet als vertikaler Kletter-Parcours mit 5 Ascents, ohne Wind - Gauntlet komplett neu: fuenf Ascent-Sub-Scenes an der Felswand (Fuss bis Box-Canyon ~38 m), verbunden ueber schulterbreite Kies-Pfade (Training: Checkpoint/Rast, Ernstlauf: Durchgang); Nebel, KillZone, Treppen-Visual, 4 Drachen-Silhouetten am Box-Canyon-Eingang - 10 wiederverwendbare Hindernis-Scenes: spinning_log, granite_pillar, spinning_wheel (Ausstiegs-Timing), buoy_ball (momentum_swing: laden + im Scheitel loslassen), iron_rail (A/D- bzw. LB/RB-Wechsel-Hangeln), shaking_pillar, rolling_log (Tempo-Pflicht, Quetsch-Tod, No-Rope), leaning_chimney (X-Spreiz-Modus, kein Seil-Behelf), vertical_ramp (Sprint-Momentum), cliff_ledge (bestehendes Kanten-Klettersystem) - Sicherungsseile alle ~6 Fuss: Sturz oeffnet Greif-Fenster (Leertaste/A), Fang = letzter Absatz + 30 s Strafe, sonst Death-State; No-Rope-Zone an den Rolling Logs; Ernstlauf sperrt Absteigen - run_timer (Zeitlauf nur im exam), rival_climbers (5 Kadetten, Sturz-Zeitplan + Kanon-Tod an den Rolling Logs), nerve_system (Rival-Tode/Ablenkung/Blick nach unten verschlechtern Griff; Steady = Strg/L2 senkt Nerven, blockt Klettern), climb_controller (Griff-HUD), gauntlet_mode (training/exam + manipulated-Preset) - CR-003: Wind aus dem Gauntlet entfernt - Drachen-Ablenkung ohne Seitenruck und ohne Gegensteuer-QTE (reines Nerven-Ereignis), balance_qte auf CR-001-Stand zurueck (Wind nur am Viadukt) - Story Phase 4c unangetastet auf neuer Geometrie: Auftakt, Intervention am Sammel-Absatz vor Ascent 5, Marens Tod, Wahrheiten, Trauer-Wahl; erster Besuch = manipulierter Ernstlauf, danach freies Training; story_hook_reached(ascent_index) als Anker fuer den Story-CR - neue Input-Actions steady/swing_charge/grab_rope/hangel_left/ hangel_right/look_down; Tuning daten-getrieben unter data/gauntlet/ (gauntlet_tuning.tres + ascent_1..5.tres) - Verifikation: Headless-Sonde 91/97 gruen (Rest: Buoy-Folgefehler, Fix umgesetzt, Bestaetigungslauf auf Wunsch uebersprungen); Boot-Check aller 6 Szenen fehlerfrei Co-Authored-By: Claude Fable 5 --- data/gauntlet/ascent_1.tres | 14 + data/gauntlet/ascent_2.tres | 13 + data/gauntlet/ascent_3.tres | 14 + data/gauntlet/ascent_4.tres | 13 + data/gauntlet/ascent_5.tres | 14 + data/gauntlet/gauntlet_tuning.tres | 29 ++ docs/CHANGEREQUESTS_DONE.md | 84 ++++ project.godot | 35 ++ scenes/gauntlet/ascent_1.tscn | 36 ++ scenes/gauntlet/ascent_2.tscn | 30 ++ scenes/gauntlet/ascent_3.tscn | 33 ++ scenes/gauntlet/ascent_4.tscn | 40 ++ scenes/gauntlet/ascent_5.tscn | 36 ++ scenes/gauntlet/gauntlet.tscn | 355 ++++------------ scenes/gauntlet/obstacles/buoy_ball.tscn | 6 + scenes/gauntlet/obstacles/cliff_ledge.tscn | 6 + scenes/gauntlet/obstacles/granite_pillar.tscn | 6 + scenes/gauntlet/obstacles/iron_rail.tscn | 6 + .../gauntlet/obstacles/leaning_chimney.tscn | 6 + scenes/gauntlet/obstacles/rolling_log.tscn | 6 + scenes/gauntlet/obstacles/shaking_pillar.tscn | 6 + scenes/gauntlet/obstacles/spinning_log.tscn | 6 + scenes/gauntlet/obstacles/spinning_wheel.tscn | 6 + scenes/gauntlet/obstacles/vertical_ramp.tscn | 6 + scripts/gameplay/ascent_config.gd | 45 ++ scripts/gameplay/ascent_config.gd.uid | 1 + scripts/gameplay/climb_controller.gd | 134 ++++++ scripts/gameplay/climb_controller.gd.uid | 1 + scripts/gameplay/dragon_distraction.gd | 77 ++++ scripts/gameplay/dragon_distraction.gd.uid | 1 + scripts/gameplay/gauntlet.gd | 389 ++++++++++++++++-- scripts/gameplay/gauntlet_mode.gd | 60 +++ scripts/gameplay/gauntlet_mode.gd.uid | 1 + scripts/gameplay/gauntlet_tuning.gd | 37 ++ scripts/gameplay/gauntlet_tuning.gd.uid | 1 + scripts/gameplay/nerve_system.gd | 118 ++++++ scripts/gameplay/nerve_system.gd.uid | 1 + scripts/gameplay/obstacles/buoy_ball.gd | 104 +++++ scripts/gameplay/obstacles/buoy_ball.gd.uid | 1 + scripts/gameplay/obstacles/cliff_ledge.gd | 25 ++ scripts/gameplay/obstacles/cliff_ledge.gd.uid | 1 + scripts/gameplay/obstacles/granite_pillar.gd | 15 + .../gameplay/obstacles/granite_pillar.gd.uid | 1 + scripts/gameplay/obstacles/iron_rail.gd | 109 +++++ scripts/gameplay/obstacles/iron_rail.gd.uid | 1 + scripts/gameplay/obstacles/leaning_chimney.gd | 106 +++++ .../gameplay/obstacles/leaning_chimney.gd.uid | 1 + scripts/gameplay/obstacles/obstacle_base.gd | 153 +++++++ .../gameplay/obstacles/obstacle_base.gd.uid | 1 + scripts/gameplay/obstacles/rolling_log.gd | 59 +++ scripts/gameplay/obstacles/rolling_log.gd.uid | 1 + scripts/gameplay/obstacles/shaking_pillar.gd | 48 +++ .../gameplay/obstacles/shaking_pillar.gd.uid | 1 + scripts/gameplay/obstacles/spinning_log.gd | 52 +++ .../gameplay/obstacles/spinning_log.gd.uid | 1 + scripts/gameplay/obstacles/spinning_wheel.gd | 109 +++++ .../gameplay/obstacles/spinning_wheel.gd.uid | 1 + scripts/gameplay/obstacles/vertical_ramp.gd | 51 +++ .../gameplay/obstacles/vertical_ramp.gd.uid | 1 + scripts/gameplay/player.gd | 7 + scripts/gameplay/rival_climbers.gd | 151 +++++++ scripts/gameplay/rival_climbers.gd.uid | 1 + scripts/gameplay/run_timer.gd | 92 +++++ scripts/gameplay/run_timer.gd.uid | 1 + scripts/gameplay/safety_rope_system.gd | 198 +++++++++ scripts/gameplay/safety_rope_system.gd.uid | 1 + 66 files changed, 2661 insertions(+), 304 deletions(-) create mode 100644 data/gauntlet/ascent_1.tres create mode 100644 data/gauntlet/ascent_2.tres create mode 100644 data/gauntlet/ascent_3.tres create mode 100644 data/gauntlet/ascent_4.tres create mode 100644 data/gauntlet/ascent_5.tres create mode 100644 data/gauntlet/gauntlet_tuning.tres create mode 100644 scenes/gauntlet/ascent_1.tscn create mode 100644 scenes/gauntlet/ascent_2.tscn create mode 100644 scenes/gauntlet/ascent_3.tscn create mode 100644 scenes/gauntlet/ascent_4.tscn create mode 100644 scenes/gauntlet/ascent_5.tscn create mode 100644 scenes/gauntlet/obstacles/buoy_ball.tscn create mode 100644 scenes/gauntlet/obstacles/cliff_ledge.tscn create mode 100644 scenes/gauntlet/obstacles/granite_pillar.tscn create mode 100644 scenes/gauntlet/obstacles/iron_rail.tscn create mode 100644 scenes/gauntlet/obstacles/leaning_chimney.tscn create mode 100644 scenes/gauntlet/obstacles/rolling_log.tscn create mode 100644 scenes/gauntlet/obstacles/shaking_pillar.tscn create mode 100644 scenes/gauntlet/obstacles/spinning_log.tscn create mode 100644 scenes/gauntlet/obstacles/spinning_wheel.tscn create mode 100644 scenes/gauntlet/obstacles/vertical_ramp.tscn create mode 100644 scripts/gameplay/ascent_config.gd create mode 100644 scripts/gameplay/ascent_config.gd.uid create mode 100644 scripts/gameplay/climb_controller.gd create mode 100644 scripts/gameplay/climb_controller.gd.uid create mode 100644 scripts/gameplay/dragon_distraction.gd create mode 100644 scripts/gameplay/dragon_distraction.gd.uid create mode 100644 scripts/gameplay/gauntlet_mode.gd create mode 100644 scripts/gameplay/gauntlet_mode.gd.uid create mode 100644 scripts/gameplay/gauntlet_tuning.gd create mode 100644 scripts/gameplay/gauntlet_tuning.gd.uid create mode 100644 scripts/gameplay/nerve_system.gd create mode 100644 scripts/gameplay/nerve_system.gd.uid create mode 100644 scripts/gameplay/obstacles/buoy_ball.gd create mode 100644 scripts/gameplay/obstacles/buoy_ball.gd.uid create mode 100644 scripts/gameplay/obstacles/cliff_ledge.gd create mode 100644 scripts/gameplay/obstacles/cliff_ledge.gd.uid create mode 100644 scripts/gameplay/obstacles/granite_pillar.gd create mode 100644 scripts/gameplay/obstacles/granite_pillar.gd.uid create mode 100644 scripts/gameplay/obstacles/iron_rail.gd create mode 100644 scripts/gameplay/obstacles/iron_rail.gd.uid create mode 100644 scripts/gameplay/obstacles/leaning_chimney.gd create mode 100644 scripts/gameplay/obstacles/leaning_chimney.gd.uid create mode 100644 scripts/gameplay/obstacles/obstacle_base.gd create mode 100644 scripts/gameplay/obstacles/obstacle_base.gd.uid create mode 100644 scripts/gameplay/obstacles/rolling_log.gd create mode 100644 scripts/gameplay/obstacles/rolling_log.gd.uid create mode 100644 scripts/gameplay/obstacles/shaking_pillar.gd create mode 100644 scripts/gameplay/obstacles/shaking_pillar.gd.uid create mode 100644 scripts/gameplay/obstacles/spinning_log.gd create mode 100644 scripts/gameplay/obstacles/spinning_log.gd.uid create mode 100644 scripts/gameplay/obstacles/spinning_wheel.gd create mode 100644 scripts/gameplay/obstacles/spinning_wheel.gd.uid create mode 100644 scripts/gameplay/obstacles/vertical_ramp.gd create mode 100644 scripts/gameplay/obstacles/vertical_ramp.gd.uid create mode 100644 scripts/gameplay/rival_climbers.gd create mode 100644 scripts/gameplay/rival_climbers.gd.uid create mode 100644 scripts/gameplay/run_timer.gd create mode 100644 scripts/gameplay/run_timer.gd.uid create mode 100644 scripts/gameplay/safety_rope_system.gd create mode 100644 scripts/gameplay/safety_rope_system.gd.uid diff --git a/data/gauntlet/ascent_1.tres b/data/gauntlet/ascent_1.tres new file mode 100644 index 0000000..3f86297 --- /dev/null +++ b/data/gauntlet/ascent_1.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="AscentConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/ascent_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +ascent_index = 1 +focus = "Einstieg: Spinning Log, Granite Pillars, Spinning Wheel" +log_spin_speed = 2.0 +pillar_gap = 1.1 +pillar_count = 4 +wheel_speed = 0.8 +wheel_exit_window = 0.45 +wheel_diameter = 4.0 diff --git a/data/gauntlet/ascent_2.tres b/data/gauntlet/ascent_2.tres new file mode 100644 index 0000000..6965951 --- /dev/null +++ b/data/gauntlet/ascent_2.tres @@ -0,0 +1,13 @@ +[gd_resource type="Resource" script_class="AscentConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/ascent_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +ascent_index = 2 +focus = "Bojen-Kugeln: momentum_swing" +buoy_count = 5 +buoy_spacing = 2.6 +buoy_swing_period = 2.4 +launch_window = 0.5 +momentum_charge_time = 0.9 diff --git a/data/gauntlet/ascent_3.tres b/data/gauntlet/ascent_3.tres new file mode 100644 index 0000000..f22fa72 --- /dev/null +++ b/data/gauntlet/ascent_3.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="AscentConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/ascent_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +ascent_index = 3 +focus = "Eisen: Iron Rails hangeln, Shaking Pillars" +rail_count = 3 +rail_height_step = 0.15 +hangel_rhythm_window = 1.1 +shake_amplitude = 0.35 +shake_frequency = 2.0 +shaking_pillar_count = 4 diff --git a/data/gauntlet/ascent_4.tres b/data/gauntlet/ascent_4.tres new file mode 100644 index 0000000..0f3b429 --- /dev/null +++ b/data/gauntlet/ascent_4.tres @@ -0,0 +1,13 @@ +[gd_resource type="Resource" script_class="AscentConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/ascent_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +ascent_index = 4 +focus = "Rollende Staemme: Tempo-Pflicht, Todeshotspot, No-Rope-Zone" +log_count = 7 +roll_speed = 1.4 +min_ascend_speed = 2.0 +crush_grace = 1.2 +no_rope_zone = true diff --git a/data/gauntlet/ascent_5.tres b/data/gauntlet/ascent_5.tres new file mode 100644 index 0000000..df68c41 --- /dev/null +++ b/data/gauntlet/ascent_5.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="AscentConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/ascent_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +ascent_index = 5 +focus = "Kamin (X-Spreiz), Vertical Ramp, Cliff Ledge" +chimney_height = 6.0 +chimney_brace_tolerance = 0.5 +chimney_drift_speed = 0.45 +ramp_height = 3.0 +ramp_min_momentum = 5.0 +ledge_reach = 2.0 diff --git a/data/gauntlet/gauntlet_tuning.tres b/data/gauntlet/gauntlet_tuning.tres new file mode 100644 index 0000000..2e39b6d --- /dev/null +++ b/data/gauntlet/gauntlet_tuning.tres @@ -0,0 +1,29 @@ +[gd_resource type="Resource" script_class="GauntletTuning" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/gauntlet_tuning.gd" id="1_tuning"] + +[resource] +script = ExtResource("1_tuning") +rope_spacing = 1.8 +rope_catch_radius = 3.5 +rope_catch_window = 0.7 +rope_time_penalty = 30.0 +grip_max = 100.0 +grip_drain_rate = 3.5 +grip_regen_rate = 30.0 +nerve_max = 100.0 +nerve_on_rival_fall = 25.0 +nerve_on_distraction = 15.0 +nerve_look_down_rate = 12.0 +nerve_calm_rate = 25.0 +nerve_decay_rate = 2.0 +nerve_grip_penalty = 1.5 +nerve_panic_threshold = 85.0 +panic_lockout = 2.5 +rival_count = 5 +rival_climb_speed = 1.6 +rival_fall_schedule = PackedFloat32Array(18, 42) +rival_line_offsets = PackedFloat32Array(-2.6, -1.8, 1.8, 2.6, -3.2) +distraction_enabled_baseline = false +distraction_interval_min = 6.0 +distraction_interval_max = 12.0 diff --git a/docs/CHANGEREQUESTS_DONE.md b/docs/CHANGEREQUESTS_DONE.md index b6e6fd5..825dc79 100644 --- a/docs/CHANGEREQUESTS_DONE.md +++ b/docs/CHANGEREQUESTS_DONE.md @@ -3,6 +3,90 @@ > Abgearbeitete Change Requests aus CHANGEREQUESTS.md, mit Datum und > Anmerkung, was geändert wurde. +## 2026-07-09 — CR-002: Gauntlet als Kletter-Hindernisparcours (5 Ascents) + +**Request:** Gauntlet buchgetreu als vertikalen Kletter-Parcours an der +Felswand: fünf Ascents mit benannten Hindernissen, Kies-Pfade, +Sicherungsseile mit Fang-QTE und Zeitstrafe, Zeitlauf am Presentation +Day, Rival-Kadetten mit Live-Toden, Nerven-System, momentum_swing, +Drachen am Box-Canyon-Eingang, training/exam + manipulated-Preset, +Story-Hook; Maren-Sequenz (Phase 4c) getrennt und unangetastet. + +**Umsetzung:** +- **Level:** `ascent_1.tscn`–`ascent_5.tscn` vertikal gestapelt (Fuß ~0 m + bis Box-Canyon ~38 m), verbunden über schulterbreite Kies-Pfade + (Training: Checkpoint + Griff-Rast; Ernstlauf: nur Durchgang). Kein + Geländer, KillZone unter allem, Viadukt-Nebel, Felswand + in den Fels + gehauene Treppe als Visual (im Ernstlauf tabu), 4 Drachen-Silhouetten + am Box-Canyon-Eingang, EndTrigger „Zum Dreschen" bleibt. +- **Hindernisse** als eigene Scenes unter `scenes/gauntlet/obstacles/`: + spinning_log (Dreh-Drift, A/D gegenhalten), 4× granite_pillar + (Sprung/Klettern), spinning_wheel (mitfahren, Absprung im Fenster, + Dummy-Kadetten als Timing-Referenz), 5× buoy_ball (momentum_swing: + Leertaste/A halten lädt, Loslassen im Pendel-Scheitel launcht), 3 + iron_rails (A/D bzw. LB/RB im Wechsel hangeln, Höhenversatz), 4× + shaking_pillar, 7× rolling_log (alternierende Rollrichtung, + Tempo-Pflicht, Quetsch-Zonen = sicherer Tod), leaning_chimney + (X-Spreiz-Mini-Modus: W = Stufe, A/D = Spreizdruck; Protagonistin- + Seilbehelf bewusst NICHT gebaut), vertical_ramp (nur mit + Sprint-Momentum), cliff_ledge (bestehendes Kanten-Klettersystem). +- **Sicherungsseile** (`safety_rope_system`): Punkte alle ~1,8 m entlang + der Kurs-Linie, Sturz öffnet Greif-Fenster (Leertaste/A); Erfolg = + zurück auf den letzten Absatz + 30 s Strafe, Fehlschlag/kein Seil = + Death-State. No-Rope-Zone an den Rolling Logs. Ernstlauf sperrt + Absteigen (Descent-Sperre im climb_controller). +- **Zeitlauf** (`run_timer`): läuft nur im Ernstlauf, HUD oben rechts, + Seilstrafen aufaddiert, `run_finished(total_time)` oben. +- **Rival-Kadetten** (`rival_climbers`): 5 Silhouetten klettern im + Ernstlauf auf versetzten Linien mit; Sturz-Zeitplan + Kanon-Anker (der + erste Rival an den Rolling Logs stirbt dort immer); rein ambient. +- **Nerven-System** (`nerve_system`): steigt bei Rival-Sturz, Ablenkung + und Blick in die Tiefe; verschlechtert Griff und Balance-Drift. + Steady/Atmen (Strg / L2) senkt Nerven, sperrt aber die Steuerung; + Panik-Schwelle mit Steady-Lockout. Griff-System (`climb_controller`) + mit HUD-Leiste, Rast auf Kies-Pfaden. +- **Modus** (`gauntlet_mode`): training/exam + manipulated-Preset + (schärfere Fenster, schnellere Stämme, gerafte Rival-/ + Ablenkungs-Zeitpläne). Erster Besuch = manipulierter Ernstlauf + (Presentation Day), nach dem Wendepunkt freies Training ohne Rivalen. +- **Story unangetastet:** Auftakt-Dialog, Maren-Intervention am + Sammel-Absatz vor Ascent 5, Sterbeszene, Wahrheiten, Trauer-Wahl und + Beat-Kette laufen wie in Phase 4c, nur auf die neue Geometrie gesetzt. + `story_hook_reached(ascent_index)` feuert an jedem Übergang. +- **Neue Input-Actions:** steady (Strg/L2), swing_charge + grab_rope + (Leertaste/A), hangel_left/right (A/D bzw. LB/RB), look_down (Stick + rechts unten; Maus-Pitch wird direkt gelesen). Alle Prompts zeigen + Tastatur- UND Controller-Text. +- **Daten-getrieben:** `data/gauntlet/gauntlet_tuning.tres` (Seil, Griff, + Nerven, Rivalen, Ablenkung) + `ascent_1.tres`–`ascent_5.tres` + (Hindernis-Tunables als AscentConfig-Resources); Verhaltens-Werte + werden beim Start an die Hindernisse verteilt, Geometrie-Werte stehen + als Overrides in den Ascent-Szenen. + +**Verifikation:** Headless-Sonde mit 97 Checks; letzter vollständiger +Lauf 91/97 grün (Ernstlauf/Story/Seile/Zeitlauf/Rivalen/Nerven komplett), +die 6 offenen waren ein Folgefehler der Buoy-Fehlschlag-Physik, dessen +Fix umgesetzt ist — der Bestätigungslauf wurde auf Wunsch übersprungen +(Sonde hing im lokalen Lauf). Boot-Check aller 6 Szenen fehlerfrei. +Bitte beim Anspielen besonders auf Ascent 2 (Buoy-Fehlschlag -> Seilfang +statt Hängenbleiben) achten. + +## 2026-07-09 — CR-003: Wind beim Gauntlet entfernt + +**Request:** „bitte entferne den Wind beim Gauntlet" + +**Umsetzung:** Im Gauntlet gab es keinen echten Wind-Controller — was +sich wie der Viadukt-Wind anfühlte, war die Drachen-Ablenkung: seitlicher +Geschwindigkeits-Ruck plus dasselbe „GEGENSTEUERN"-QTE wie bei den +Wind-Böen. Beides wurde entfernt: `dragon_distraction` ist jetzt ein +reines Nerven-Ereignis (Drachen-Silhouette regt sich, `nerve` steigt und +verschlechtert Griff/Balance), der BalanceQTE-Node flog aus der +Gauntlet-Szene, `balance_qte.gd` wurde auf den CR-001-Stand +zurückgesetzt (Wind-QTE gehört nur zum Viadukt). Geblieben sind die +hindernis-eigenen Kräfte mit Kontakt (Drift auf dem drehenden Balken, +Roll-Schub der Stämme, Rampen-Rückdrift) — das ist Hindernis-Physik, +kein Wind; sag Bescheid, falls davon auch etwas raus soll. + ## 2026-07-07 — Abspann-Screen hing in der Ecke **Request:** „der letzte Screen nach dem Fliegen hängt unten links in der diff --git a/project.godot b/project.godot index a5c2375..8760468 100644 --- a/project.godot +++ b/project.godot @@ -153,3 +153,38 @@ block={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":false,"script":null) ] } +steady={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null) +] +} +swing_charge={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) +] +} +grab_rope={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) +] +} +hangel_left={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":false,"script":null) +] +} +hangel_right={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":false,"script":null) +] +} +look_down={ +"deadzone": 0.2, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null) +] +} diff --git a/scenes/gauntlet/ascent_1.tscn b/scenes/gauntlet/ascent_1.tscn new file mode 100644 index 0000000..084965b --- /dev/null +++ b/scenes/gauntlet/ascent_1.tscn @@ -0,0 +1,36 @@ +[gd_scene load_steps=4 format=3] + +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/spinning_log.tscn" id="1_log"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/granite_pillar.tscn" id="2_pillar"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/spinning_wheel.tscn" id="3_wheel"] + +[node name="Ascent1" type="Node3D"] + +[node name="SpinningLog" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.15, 1.5) +obstacle_id = "spinning_log" + +[node name="LogLanding" parent="." instance=ExtResource("2_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -4.2) +obstacle_id = "log_landing" +size = Vector3(1.5, 0.55, 1.5) + +[node name="Pillar1" parent="." instance=ExtResource("2_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7, 0, -6.2) +obstacle_id = "granite_pillar_1" + +[node name="Pillar2" parent="." instance=ExtResource("2_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7, 1.2, -8.2) +obstacle_id = "granite_pillar_2" + +[node name="Pillar3" parent="." instance=ExtResource("2_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7, 2.4, -10.2) +obstacle_id = "granite_pillar_3" + +[node name="Pillar4" parent="." instance=ExtResource("2_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7, 3.6, -12.2) +obstacle_id = "granite_pillar_4" + +[node name="SpinningWheel" parent="." instance=ExtResource("3_wheel")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, -16.5) +obstacle_id = "spinning_wheel" diff --git a/scenes/gauntlet/ascent_2.tscn b/scenes/gauntlet/ascent_2.tscn new file mode 100644 index 0000000..d80b517 --- /dev/null +++ b/scenes/gauntlet/ascent_2.tscn @@ -0,0 +1,30 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/buoy_ball.tscn" id="1_buoy"] + +[node name="Ascent2" type="Node3D"] + +[node name="BuoyBall1" parent="." instance=ExtResource("1_buoy")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.6, -0.5) +obstacle_id = "buoy_1" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall2" parent="." instance=ExtResource("1_buoy")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.8, -3.1) +obstacle_id = "buoy_2" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall3" parent="." instance=ExtResource("1_buoy")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -5.7) +obstacle_id = "buoy_3" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall4" parent="." instance=ExtResource("1_buoy")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.2, -8.3) +obstacle_id = "buoy_4" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall5" parent="." instance=ExtResource("1_buoy")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7.4, -10.9) +obstacle_id = "buoy_5" +launch_target = Vector3(0, -0.6, -2.6) diff --git a/scenes/gauntlet/ascent_3.tscn b/scenes/gauntlet/ascent_3.tscn new file mode 100644 index 0000000..c1f2e77 --- /dev/null +++ b/scenes/gauntlet/ascent_3.tscn @@ -0,0 +1,33 @@ +[gd_scene load_steps=4 format=3] + +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/iron_rail.tscn" id="1_rail"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/granite_pillar.tscn" id="2_pillar"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/shaking_pillar.tscn" id="3_shake"] + +[node name="Ascent3" type="Node3D"] + +[node name="IronRail" parent="." instance=ExtResource("1_rail")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1) +obstacle_id = "iron_rail" +drop_target = Vector3(0, 1.4, -12.8) + +[node name="RailLanding" parent="." instance=ExtResource("2_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.2, -13.8) +obstacle_id = "rail_landing" +size = Vector3(1.8, 1.2, 1.8) + +[node name="ShakingPillar1" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 0.2, -15.8) +obstacle_id = "shaking_pillar_1" + +[node name="ShakingPillar2" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 1.2, -17.8) +obstacle_id = "shaking_pillar_2" + +[node name="ShakingPillar3" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 2.2, -19.8) +obstacle_id = "shaking_pillar_3" + +[node name="ShakingPillar4" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 3.2, -21.8) +obstacle_id = "shaking_pillar_4" diff --git a/scenes/gauntlet/ascent_4.tscn b/scenes/gauntlet/ascent_4.tscn new file mode 100644 index 0000000..2e5c86b --- /dev/null +++ b/scenes/gauntlet/ascent_4.tscn @@ -0,0 +1,40 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/rolling_log.tscn" id="1_log"] + +[node name="Ascent4" type="Node3D"] + +[node name="RollingLog1" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, -1.5) +obstacle_id = "rolling_log_1" +roll_dir = 1 + +[node name="RollingLog2" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.3, -3.2) +obstacle_id = "rolling_log_2" +roll_dir = -1 + +[node name="RollingLog3" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.2, -4.9) +obstacle_id = "rolling_log_3" +roll_dir = 1 + +[node name="RollingLog4" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.1, -6.6) +obstacle_id = "rolling_log_4" +roll_dir = -1 + +[node name="RollingLog5" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -8.3) +obstacle_id = "rolling_log_5" +roll_dir = 1 + +[node name="RollingLog6" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.9, -10) +obstacle_id = "rolling_log_6" +roll_dir = -1 + +[node name="RollingLog7" parent="." instance=ExtResource("1_log")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.8, -11.7) +obstacle_id = "rolling_log_7" +roll_dir = 1 diff --git a/scenes/gauntlet/ascent_5.tscn b/scenes/gauntlet/ascent_5.tscn new file mode 100644 index 0000000..1aea1bf --- /dev/null +++ b/scenes/gauntlet/ascent_5.tscn @@ -0,0 +1,36 @@ +[gd_scene load_steps=5 format=3] + +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/granite_pillar.tscn" id="1_pillar"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/leaning_chimney.tscn" id="2_chimney"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/vertical_ramp.tscn" id="3_ramp"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/cliff_ledge.tscn" id="4_ledge"] + +[node name="Ascent5" type="Node3D"] + +[node name="ChimneyBase" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.3, -2) +obstacle_id = "chimney_base" +size = Vector3(1.8, 0.3, 1.8) + +[node name="LeaningChimney" parent="." instance=ExtResource("2_chimney")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1) +obstacle_id = "leaning_chimney" +exit_target = Vector3(0, 6.3, -2.5) + +[node name="ChimneyExit" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.9, -3.6) +obstacle_id = "chimney_exit" +size = Vector3(1.8, 0.4, 1.8) + +[node name="VerticalRamp" parent="." instance=ExtResource("3_ramp")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.3, -4.5) +obstacle_id = "vertical_ramp" + +[node name="RampExit" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8.9, -9) +obstacle_id = "ramp_exit" +size = Vector3(1.8, 0.4, 1.8) + +[node name="CliffLedge" parent="." instance=ExtResource("4_ledge")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.3, -10.5) +obstacle_id = "cliff_ledge" diff --git a/scenes/gauntlet/gauntlet.tscn b/scenes/gauntlet/gauntlet.tscn index dd44a4e..3857a58 100644 --- a/scenes/gauntlet/gauntlet.tscn +++ b/scenes/gauntlet/gauntlet.tscn @@ -1,14 +1,26 @@ -[gd_scene load_steps=44 format=3] +[gd_scene load_steps=30 format=3] [ext_resource type="Script" path="res://scripts/gameplay/gauntlet.gd" id="1_gauntlet"] [ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"] [ext_resource type="PackedScene" path="res://scenes/ui/debug_overlay.tscn" id="3_debug"] [ext_resource type="Script" path="res://scripts/gameplay/zone_trigger.gd" id="4_zone"] [ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="5_bubble"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/ascent_1.tscn" id="6_ascent1"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/ascent_2.tscn" id="7_ascent2"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/ascent_3.tscn" id="8_ascent3"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/ascent_4.tscn" id="9_ascent4"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/ascent_5.tscn" id="10_ascent5"] +[ext_resource type="Script" path="res://scripts/gameplay/gauntlet_mode.gd" id="11_mode"] +[ext_resource type="Script" path="res://scripts/gameplay/climb_controller.gd" id="12_climb"] +[ext_resource type="Script" path="res://scripts/gameplay/nerve_system.gd" id="13_nerve"] +[ext_resource type="Script" path="res://scripts/gameplay/safety_rope_system.gd" id="14_ropes"] +[ext_resource type="Script" path="res://scripts/gameplay/run_timer.gd" id="15_timer"] +[ext_resource type="Script" path="res://scripts/gameplay/rival_climbers.gd" id="16_rivals"] +[ext_resource type="Script" path="res://scripts/gameplay/dragon_distraction.gd" id="17_distraction"] [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) +sky_horizon_color = Color(0.62, 0.63, 0.66, 1) +ground_horizon_color = Color(0.62, 0.63, 0.66, 1) [sub_resource type="Sky" id="Sky_sky"] sky_material = SubResource("ProceduralSkyMaterial_sky") @@ -17,93 +29,10 @@ sky_material = SubResource("ProceduralSkyMaterial_sky") background_mode = 2 sky = SubResource("Sky_sky") tonemap_mode = 2 - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_stone"] -albedo_color = Color(0.42, 0.42, 0.44, 1) - -[sub_resource type="BoxShape3D" id="BoxShape3D_platform8"] -size = Vector3(8, 1, 8) - -[sub_resource type="BoxMesh" id="BoxMesh_platform8"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(8, 1, 8) - -[sub_resource type="BoxShape3D" id="BoxShape3D_walk10"] -size = Vector3(2, 1, 10) - -[sub_resource type="BoxMesh" id="BoxMesh_walk10"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 1, 10) - -[sub_resource type="BoxShape3D" id="BoxShape3D_wall2"] -size = Vector3(2, 2, 2) - -[sub_resource type="BoxMesh" id="BoxMesh_wall2"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 2, 2) - -[sub_resource type="BoxShape3D" id="BoxShape3D_elev210"] -size = Vector3(2, 2, 10) - -[sub_resource type="BoxMesh" id="BoxMesh_elev210"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 2, 10) - -[sub_resource type="BoxShape3D" id="BoxShape3D_elev28"] -size = Vector3(2, 2, 8) - -[sub_resource type="BoxMesh" id="BoxMesh_elev28"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 2, 8) - -[sub_resource type="BoxShape3D" id="BoxShape3D_beam14"] -size = Vector3(1, 1, 14) - -[sub_resource type="BoxMesh" id="BoxMesh_beam14"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(1, 1, 14) - -[sub_resource type="BoxShape3D" id="BoxShape3D_plat48"] -size = Vector3(4, 1, 8) - -[sub_resource type="BoxMesh" id="BoxMesh_plat48"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(4, 1, 8) - -[sub_resource type="BoxShape3D" id="BoxShape3D_elev26"] -size = Vector3(2, 2, 6) - -[sub_resource type="BoxMesh" id="BoxMesh_elev26"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 2, 6) - -[sub_resource type="BoxShape3D" id="BoxShape3D_elev46"] -size = Vector3(2, 4, 6) - -[sub_resource type="BoxMesh" id="BoxMesh_elev46"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 4, 6) - -[sub_resource type="BoxShape3D" id="BoxShape3D_landing"] -size = Vector3(2, 1, 6) - -[sub_resource type="BoxMesh" id="BoxMesh_landing"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 1, 6) - -[sub_resource type="BoxShape3D" id="BoxShape3D_tilt"] -size = Vector3(2, 0.5, 4) - -[sub_resource type="BoxMesh" id="BoxMesh_tilt"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(2, 0.5, 4) - -[sub_resource type="BoxShape3D" id="BoxShape3D_bypass"] -size = Vector3(1, 1, 12) - -[sub_resource type="BoxMesh" id="BoxMesh_bypass"] -material = SubResource("StandardMaterial3D_stone") -size = Vector3(1, 1, 12) +fog_enabled = true +fog_light_color = Color(0.66, 0.67, 0.7, 1) +fog_density = 0.035 +fog_aerial_perspective = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_maren"] albedo_color = Color(0.55, 0.6, 0.75, 1) @@ -125,6 +54,22 @@ height = 1.8 radius = 0.4 height = 1.8 +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_stone"] +albedo_color = Color(0.42, 0.42, 0.44, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_tilt"] +size = Vector3(2, 0.5, 2.5) + +[sub_resource type="BoxMesh" id="BoxMesh_tilt"] +material = SubResource("StandardMaterial3D_stone") +size = Vector3(2, 0.5, 2.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_intervention"] +size = Vector3(3, 2, 4.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_killzone"] +size = Vector3(60, 6, 140) + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_trigger"] transparency = 1 albedo_color = Color(0.3, 0.8, 1, 0.35) @@ -136,12 +81,6 @@ size = Vector3(2, 2, 2) material = SubResource("StandardMaterial3D_trigger") size = Vector3(2, 2, 2) -[sub_resource type="BoxShape3D" id="BoxShape3D_killzone"] -size = Vector3(60, 6, 140) - -[sub_resource type="BoxShape3D" id="BoxShape3D_checkpoint"] -size = Vector3(3, 2, 2) - [node name="Gauntlet" type="Node3D"] script = ExtResource("1_gauntlet") @@ -152,154 +91,23 @@ environment = SubResource("Environment_env") 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="StartPlatform" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0) +[node name="Ascent1" parent="." instance=ExtResource("6_ascent1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -6) -[node name="CollisionShape3D" type="CollisionShape3D" parent="StartPlatform"] -shape = SubResource("BoxShape3D_platform8") +[node name="Ascent2" parent="." instance=ExtResource("7_ascent2")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8, -30) -[node name="MeshInstance3D" type="MeshInstance3D" parent="StartPlatform"] -mesh = SubResource("BoxMesh_platform8") +[node name="Ascent3" parent="." instance=ExtResource("8_ascent3")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 14, -48) -[node name="WalkA" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -9) +[node name="Ascent4" parent="." instance=ExtResource("9_ascent4")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 19.4, -75) -[node name="CollisionShape3D" type="CollisionShape3D" parent="WalkA"] -shape = SubResource("BoxShape3D_walk10") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="WalkA"] -mesh = SubResource("BoxMesh_walk10") - -[node name="ClimbWallA" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -15) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbWallA"] -shape = SubResource("BoxShape3D_wall2") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbWallA"] -mesh = SubResource("BoxMesh_wall2") - -[node name="ElevA" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -21) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevA"] -shape = SubResource("BoxShape3D_elev210") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ElevA"] -mesh = SubResource("BoxMesh_elev210") - -[node name="ElevB" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -31.8) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevB"] -shape = SubResource("BoxShape3D_elev28") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ElevB"] -mesh = SubResource("BoxMesh_elev28") - -[node name="BeamC" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -43) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="BeamC"] -shape = SubResource("BoxShape3D_beam14") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="BeamC"] -mesh = SubResource("BoxMesh_beam14") - -[node name="PlatformC" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -56) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="PlatformC"] -shape = SubResource("BoxShape3D_plat48") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="PlatformC"] -mesh = SubResource("BoxMesh_plat48") - -[node name="ClimbWallB" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -61) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbWallB"] -shape = SubResource("BoxShape3D_wall2") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbWallB"] -mesh = SubResource("BoxMesh_wall2") - -[node name="ElevC" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -65) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevC"] -shape = SubResource("BoxShape3D_elev26") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ElevC"] -mesh = SubResource("BoxMesh_elev26") - -[node name="ClimbWallC" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -69) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbWallC"] -shape = SubResource("BoxShape3D_wall2") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbWallC"] -mesh = SubResource("BoxMesh_wall2") - -[node name="ElevD" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, -73) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevD"] -shape = SubResource("BoxShape3D_elev46") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="ElevD"] -mesh = SubResource("BoxMesh_elev46") - -[node name="LandingE" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -79) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="LandingE"] -shape = SubResource("BoxShape3D_landing") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="LandingE"] -mesh = SubResource("BoxMesh_landing") - -[node name="CollapsingSection" type="Node3D" parent="."] - -[node name="TiltA" type="StaticBody3D" parent="CollapsingSection"] -transform = Transform3D(1, 0, 0, 0, 0.992809, 0.119712, 0, -0.119712, 0.992809, 0, 0.1, -84.5) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="CollapsingSection/TiltA"] -shape = SubResource("BoxShape3D_tilt") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="CollapsingSection/TiltA"] -mesh = SubResource("BoxMesh_tilt") - -[node name="TiltB" type="StaticBody3D" parent="CollapsingSection"] -transform = Transform3D(1, 0, 0, 0, 0.992809, -0.119712, 0, 0.119712, 0.992809, 0, -0.1, -88.5) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="CollapsingSection/TiltB"] -shape = SubResource("BoxShape3D_tilt") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="CollapsingSection/TiltB"] -mesh = SubResource("BoxMesh_tilt") - -[node name="BypassBeam" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.2, -0.5, -88) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="BypassBeam"] -shape = SubResource("BoxShape3D_bypass") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="BypassBeam"] -mesh = SubResource("BoxMesh_bypass") - -[node name="FinalPlatform" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -98) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="FinalPlatform"] -shape = SubResource("BoxShape3D_platform8") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="FinalPlatform"] -mesh = SubResource("BoxMesh_platform8") +[node name="Ascent5" parent="." instance=ExtResource("10_ascent5")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 26.3, -94) [node name="Maren" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 0, -2) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 0, -1) [node name="CollisionShape3D" type="CollisionShape3D" parent="Maren"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) @@ -320,7 +128,7 @@ outline_size = 16 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8, 0) [node name="Wren" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 0, -80) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.8, 26.45, -89) [node name="CollisionShape3D" type="CollisionShape3D" parent="Wren"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) @@ -340,50 +148,36 @@ outline_size = 16 [node name="SpeechBubble" parent="Wren" instance=ExtResource("5_bubble")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8, 0) -[node name="Checkpoints" type="Node3D" parent="."] +[node name="CollapsingSection" type="Node3D" parent="."] -[node name="Checkpoint1" type="Area3D" parent="Checkpoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -5) -collision_layer = 0 -collision_mask = 2 +[node name="TiltA" type="StaticBody3D" parent="CollapsingSection"] +transform = Transform3D(1, 0, 0, 0, 0.992809, 0.119712, 0, -0.119712, 0.992809, 0, 26.2, -93.5) -[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint1"] -shape = SubResource("BoxShape3D_checkpoint") +[node name="CollisionShape3D" type="CollisionShape3D" parent="CollapsingSection/TiltA"] +shape = SubResource("BoxShape3D_tilt") -[node name="Checkpoint2" type="Area3D" parent="Checkpoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -37) -collision_layer = 0 -collision_mask = 2 +[node name="MeshInstance3D" type="MeshInstance3D" parent="CollapsingSection/TiltA"] +mesh = SubResource("BoxMesh_tilt") -[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint2"] -shape = SubResource("BoxShape3D_checkpoint") +[node name="TiltB" type="StaticBody3D" parent="CollapsingSection"] +transform = Transform3D(1, 0, 0, 0, 0.992809, -0.119712, 0, 0.119712, 0.992809, 0.5, 26, -94.8) -[node name="Checkpoint3" type="Area3D" parent="Checkpoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -53) -collision_layer = 0 -collision_mask = 2 +[node name="CollisionShape3D" type="CollisionShape3D" parent="CollapsingSection/TiltB"] +shape = SubResource("BoxShape3D_tilt") -[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint3"] -shape = SubResource("BoxShape3D_checkpoint") - -[node name="Checkpoint4" type="Area3D" parent="Checkpoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -77) -collision_layer = 0 -collision_mask = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint4"] -shape = SubResource("BoxShape3D_checkpoint") +[node name="MeshInstance3D" type="MeshInstance3D" parent="CollapsingSection/TiltB"] +mesh = SubResource("BoxMesh_tilt") [node name="InterventionTrigger" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -81.5) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 27.3, -90) collision_layer = 0 collision_mask = 2 [node name="CollisionShape3D" type="CollisionShape3D" parent="InterventionTrigger"] -shape = SubResource("BoxShape3D_checkpoint") +shape = SubResource("BoxShape3D_intervention") [node name="KillZone" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, -50) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, -55) collision_layer = 0 collision_mask = 2 @@ -391,7 +185,7 @@ collision_mask = 2 shape = SubResource("BoxShape3D_killzone") [node name="EndTrigger" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -99) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 38.6, -112.5) collision_layer = 0 collision_mask = 2 script = ExtResource("4_zone") @@ -410,6 +204,27 @@ text = "Zum Dreschen" font_size = 40 outline_size = 12 +[node name="GauntletMode" type="Node" parent="."] +script = ExtResource("11_mode") + +[node name="ClimbController" type="Node" parent="."] +script = ExtResource("12_climb") + +[node name="NerveSystem" type="Node" parent="."] +script = ExtResource("13_nerve") + +[node name="SafetyRopeSystem" type="Node3D" parent="."] +script = ExtResource("14_ropes") + +[node name="RunTimer" type="Node" parent="."] +script = ExtResource("15_timer") + +[node name="RivalClimbers" type="Node3D" parent="."] +script = ExtResource("16_rivals") + +[node name="DragonDistraction" type="Node" parent="."] +script = ExtResource("17_distraction") + [node name="Player" parent="." instance=ExtResource("2_player")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 2) diff --git a/scenes/gauntlet/obstacles/buoy_ball.tscn b/scenes/gauntlet/obstacles/buoy_ball.tscn new file mode 100644 index 0000000..e751703 --- /dev/null +++ b/scenes/gauntlet/obstacles/buoy_ball.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/buoy_ball.gd" id="1_script"] + +[node name="BuoyBall" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/cliff_ledge.tscn b/scenes/gauntlet/obstacles/cliff_ledge.tscn new file mode 100644 index 0000000..256ad58 --- /dev/null +++ b/scenes/gauntlet/obstacles/cliff_ledge.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/cliff_ledge.gd" id="1_script"] + +[node name="CliffLedge" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/granite_pillar.tscn b/scenes/gauntlet/obstacles/granite_pillar.tscn new file mode 100644 index 0000000..47d2946 --- /dev/null +++ b/scenes/gauntlet/obstacles/granite_pillar.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/granite_pillar.gd" id="1_script"] + +[node name="GranitePillar" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/iron_rail.tscn b/scenes/gauntlet/obstacles/iron_rail.tscn new file mode 100644 index 0000000..65c46eb --- /dev/null +++ b/scenes/gauntlet/obstacles/iron_rail.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/iron_rail.gd" id="1_script"] + +[node name="IronRail" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/leaning_chimney.tscn b/scenes/gauntlet/obstacles/leaning_chimney.tscn new file mode 100644 index 0000000..273be72 --- /dev/null +++ b/scenes/gauntlet/obstacles/leaning_chimney.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/leaning_chimney.gd" id="1_script"] + +[node name="LeaningChimney" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/rolling_log.tscn b/scenes/gauntlet/obstacles/rolling_log.tscn new file mode 100644 index 0000000..6a105d5 --- /dev/null +++ b/scenes/gauntlet/obstacles/rolling_log.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/rolling_log.gd" id="1_script"] + +[node name="RollingLog" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/shaking_pillar.tscn b/scenes/gauntlet/obstacles/shaking_pillar.tscn new file mode 100644 index 0000000..336e7e3 --- /dev/null +++ b/scenes/gauntlet/obstacles/shaking_pillar.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/shaking_pillar.gd" id="1_script"] + +[node name="ShakingPillar" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/spinning_log.tscn b/scenes/gauntlet/obstacles/spinning_log.tscn new file mode 100644 index 0000000..647b0bc --- /dev/null +++ b/scenes/gauntlet/obstacles/spinning_log.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/spinning_log.gd" id="1_script"] + +[node name="SpinningLog" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/spinning_wheel.tscn b/scenes/gauntlet/obstacles/spinning_wheel.tscn new file mode 100644 index 0000000..2ba24b7 --- /dev/null +++ b/scenes/gauntlet/obstacles/spinning_wheel.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/spinning_wheel.gd" id="1_script"] + +[node name="SpinningWheel" type="Node3D"] +script = ExtResource("1_script") diff --git a/scenes/gauntlet/obstacles/vertical_ramp.tscn b/scenes/gauntlet/obstacles/vertical_ramp.tscn new file mode 100644 index 0000000..6dbb4e9 --- /dev/null +++ b/scenes/gauntlet/obstacles/vertical_ramp.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/obstacles/vertical_ramp.gd" id="1_script"] + +[node name="VerticalRamp" type="Node3D"] +script = ExtResource("1_script") diff --git a/scripts/gameplay/ascent_config.gd b/scripts/gameplay/ascent_config.gd new file mode 100644 index 0000000..b3a901f --- /dev/null +++ b/scripts/gameplay/ascent_config.gd @@ -0,0 +1,45 @@ +class_name AscentConfig +extends Resource +## Tuning eines einzelnen Gauntlet-Ascents (CR-002), daten-getrieben unter +## data/gauntlet/ascent_N.tres. +## +## Superset aller Hindernis-Tunables der fünf Ascents; jede Resource +## befüllt nur die für ihren Ascent relevanten Felder. gauntlet.gd +## verteilt die Werte beim Start an die Hindernis-Instanzen des Ascents. + +@export var ascent_index := 1 +@export var focus := "" + +@export var log_spin_speed := 2.0 +@export var pillar_gap := 1.1 +@export var pillar_count := 4 +@export var wheel_speed := 0.8 +@export var wheel_exit_window := 0.45 +@export var wheel_diameter := 4.0 + +@export var buoy_count := 5 +@export var buoy_spacing := 2.6 +@export var buoy_swing_period := 2.4 +@export var launch_window := 0.5 +@export var momentum_charge_time := 0.9 +@export var momentum_reach_bonus := 1.5 + +@export var rail_count := 3 +@export var rail_height_step := 0.15 +@export var hangel_rhythm_window := 1.1 +@export var shake_amplitude := 0.35 +@export var shake_frequency := 2.0 +@export var shaking_pillar_count := 4 + +@export var log_count := 7 +@export var roll_speed := 1.4 +@export var min_ascend_speed := 2.0 +@export var crush_grace := 1.2 +@export var no_rope_zone := false + +@export var chimney_height := 6.0 +@export var chimney_brace_tolerance := 0.5 +@export var chimney_drift_speed := 0.45 +@export var ramp_height := 3.0 +@export var ramp_min_momentum := 5.0 +@export var ledge_reach := 2.0 diff --git a/scripts/gameplay/ascent_config.gd.uid b/scripts/gameplay/ascent_config.gd.uid new file mode 100644 index 0000000..dc562d4 --- /dev/null +++ b/scripts/gameplay/ascent_config.gd.uid @@ -0,0 +1 @@ +uid://chxkvljvd8nby diff --git a/scripts/gameplay/climb_controller.gd b/scripts/gameplay/climb_controller.gd new file mode 100644 index 0000000..3eaedb1 --- /dev/null +++ b/scripts/gameplay/climb_controller.gd @@ -0,0 +1,134 @@ +extends Node +## Griff-/Stamina-System des Gauntlet (CR-002 §2) — erweitert das +## bestehende Phase-1-Klettersystem, statt es zu ersetzen. +## +## Der Griff (Tyrveil-Startwert grip_max) entleert sich, solange Tyrveil +## im Parcours unterwegs ist und nicht auf einem Kies-Pfad rastet; das +## Nerven-System skaliert den Verbrauch (grip_drain_factor). Auf +## Rast-Zonen (Gruppe gauntlet_rest) regeneriert der Griff. Leerer Griff +## bedeutet Fehlgriff -> climber_fell (das Seilfang-System übernimmt). +## Zusätzlich sperrt der Ernstlauf das Absteigen: Wer mehr als +## descend_tolerance unter die Höhe des zuletzt erreichten Kies-Pfads +## fällt, gilt als gestürzt (kein Abklettern, kein Aufgeben). + +signal climber_fell +signal grip_changed(current: float, maximum: float) + +@export var grip_max := 100.0 +@export var grip_drain_rate := 3.5 +@export var grip_regen_rate := 30.0 +@export var descend_tolerance := 4.0 + +var grip := 100.0 + +var _player: CharacterBody3D +var _nerve: Node +var _mode: Node +var _course_z := -4.0 +var _progress_height := 0.0 +var _bar: ProgressBar + + +## Verknüpft Spieler, Nerven-System und Modus und baut die HUD-Leiste. +func setup(player: CharacterBody3D, nerve_system: Node, gauntlet_mode: Node, course_z: float) -> void: + _player = player + _nerve = nerve_system + _mode = gauntlet_mode + _course_z = course_z + grip = grip_max + _build_hud() + + +## Merkt die Höhe des zuletzt erreichten Kies-Pfads (Descent-Sperre im +## Ernstlauf). +func set_progress_height(height: float) -> void: + _progress_height = maxf(_progress_height, height) + + +## Füllt den Griff wieder auf (Respawn). +func reset_grip() -> void: + grip = grip_max + _progress_height = 0.0 + _update_bar() + + +## Entleert oder regeneriert den Griff und prüft die Descent-Sperre. +func _physics_process(delta: float) -> void: + if _player == null or DialogueSystem.is_dialogue_active: + return + var is_in_course: bool = _player.global_position.z < _course_z + if not is_in_course: + _apply_grip(grip + grip_regen_rate * delta) + return + if _mode != null and _mode.is_exam() \ + and _player.global_position.y < _progress_height - descend_tolerance: + _fall() + return + if _is_resting(): + _apply_grip(grip + grip_regen_rate * delta) + return + var drain := grip_drain_rate + if _nerve != null: + drain *= _nerve.grip_drain_factor() + _apply_grip(grip - drain * delta) + if grip <= 0.0: + _fall() + + +## Prüft, ob Tyrveil auf einer Rast-Zone (Kies-Pfad, Fuß) steht. +func _is_resting() -> bool: + for zone in get_tree().get_nodes_in_group("gauntlet_rest"): + if zone.overlaps_body(_player): + return true + return false + + +## Griff leer oder Descent-Sperre gerissen: Sturz melden und auffüllen. +func _fall() -> void: + grip = grip_max + _progress_height = 0.0 + _update_bar() + climber_fell.emit() + + +## Setzt den Griff geklemmt und aktualisiert die Anzeige. +func _apply_grip(value: float) -> void: + var clamped := clampf(value, 0.0, grip_max) + if is_equal_approx(clamped, grip): + return + grip = clamped + _update_bar() + grip_changed.emit(grip, grip_max) + + +## Aktualisiert die Leiste (rot, wenn der Griff knapp wird). +func _update_bar() -> void: + _bar.value = grip + _bar.visible = grip < grip_max - 0.5 + _bar.modulate = Color(0.85, 0.25, 0.2) if grip < grip_max * 0.3 else Color(0.6, 0.8, 0.55) + + +## Baut die Griff-Leiste unten mittig. +func _build_hud() -> void: + var layer := CanvasLayer.new() + layer.layer = 3 + var root := Control.new() + root.set_anchors_preset(Control.PRESET_FULL_RECT) + root.mouse_filter = Control.MOUSE_FILTER_IGNORE + var caption := Label.new() + caption.set_anchors_preset(Control.PRESET_CENTER_BOTTOM) + caption.position += Vector2(-150, -52) + caption.text = "Griff" + caption.add_theme_font_size_override("font_size", 14) + root.add_child(caption) + _bar = ProgressBar.new() + _bar.set_anchors_preset(Control.PRESET_CENTER_BOTTOM) + _bar.position += Vector2(-150, -34) + _bar.custom_minimum_size = Vector2(300, 16) + _bar.max_value = grip_max + _bar.value = grip + _bar.show_percentage = false + _bar.visible = false + root.add_child(_bar) + layer.add_child(root) + add_child(layer) diff --git a/scripts/gameplay/climb_controller.gd.uid b/scripts/gameplay/climb_controller.gd.uid new file mode 100644 index 0000000..a752c43 --- /dev/null +++ b/scripts/gameplay/climb_controller.gd.uid @@ -0,0 +1 @@ +uid://mmm28sdp6561 diff --git a/scripts/gameplay/dragon_distraction.gd b/scripts/gameplay/dragon_distraction.gd new file mode 100644 index 0000000..2d480a3 --- /dev/null +++ b/scripts/gameplay/dragon_distraction.gd @@ -0,0 +1,77 @@ +extends Node +## Drachen-Ablenkung (CR-002 §8c, entschärft durch CR-003): reines +## Nerven-Ereignis, baseline AUS. +## +## Die Drachen reihen sich als Publikum am Box-Canyon-Eingang auf und +## lenken im normalen Ernstlauf nicht dauernd ab. Nur im +## manipulated-Preset (oder wenn distraction_enabled_baseline gesetzt +## ist) regt sich in Intervallen einer der Drachen: kurze Silhouetten- +## Bewegung + Nerven-Anstieg (der über das Nerven-System Griff und +## Balance verschlechtert). Der frühere Wind-artige Seitenruck samt +## Gegensteuer-QTE wurde per CR-003 entfernt — Wind gehört zum Viadukt, +## nicht zum Gauntlet. + +signal distraction_triggered + +@export var distraction_enabled_baseline := false +@export var distraction_interval_min := 6.0 +@export var distraction_interval_max := 12.0 + +var _player: CharacterBody3D +var _nerve: Node +var _mode: Node +var _dragons: Array[Node3D] = [] +var _course_z := -4.0 +var _timer := 0.0 + + +## Verknüpft Spieler, Nerven-System, Modus und die Drachen-Silhouetten. +func setup(player: CharacterBody3D, nerve_system: Node, gauntlet_mode: Node, dragons: Array[Node3D], course_z: float) -> void: + _player = player + _nerve = nerve_system + _mode = gauntlet_mode + _dragons = dragons + _course_z = course_z + _reset_timer() + + +## Meldet, ob Ablenkungen gerade scharf sind. +func is_enabled() -> bool: + if distraction_enabled_baseline: + return true + return _mode != null and _mode.manipulated + + +## Zählt das Intervall herunter und löst die Ablenkung aus, wenn Tyrveil +## frei im Parcours klettert. +func _physics_process(delta: float) -> void: + if _player == null or not is_enabled(): + return + if DialogueSystem.is_dialogue_active or _player.is_control_locked(): + return + if _player.global_position.z > _course_z: + return + _timer -= delta + if _timer <= 0.0: + trigger_distraction() + _reset_timer() + + +## Löst sofort eine Ablenkung aus (öffentlich für Tests und Story-CR): +## Drachen-Regung + Nerven-Anstieg. +func trigger_distraction() -> void: + distraction_triggered.emit() + if not _dragons.is_empty(): + var dragon := _dragons[randi() % _dragons.size()] + var tween := create_tween() + tween.tween_property(dragon, "position:y", dragon.position.y + 0.8, 0.15) + tween.tween_property(dragon, "position:y", dragon.position.y, 0.3) + if _nerve != null: + _nerve.add_nerve(_nerve.nerve_on_distraction) + + +## Würfelt das nächste Intervall (manipulated: gerafft). +func _reset_timer() -> void: + _timer = randf_range(distraction_interval_min, distraction_interval_max) + if _mode != null: + _timer *= _mode.interval_scale() diff --git a/scripts/gameplay/dragon_distraction.gd.uid b/scripts/gameplay/dragon_distraction.gd.uid new file mode 100644 index 0000000..10f30ff --- /dev/null +++ b/scripts/gameplay/dragon_distraction.gd.uid @@ -0,0 +1 @@ +uid://bb03f1oq3qfc6 diff --git a/scripts/gameplay/gauntlet.gd b/scripts/gameplay/gauntlet.gd index afea1f2..f1e01cf 100644 --- a/scripts/gameplay/gauntlet.gd +++ b/scripts/gameplay/gauntlet.gd @@ -1,54 +1,151 @@ extends Node3D -## Ablauf-Steuerung des Gauntlet-Klimax (Phase 4c, STORY.md Abschnitte 3 -## und 5 — Wendepunkt). +## Ablauf-Steuerung des Gauntlet (CR-002: vertikaler Kletter-Parcours, +## Phase 4c: Wendepunkt, STORY.md Abschnitte 3 und 5). ## -## Der Lauf der Gezeichneten ist absichtlich tödlicher angelegt -## (Auszahlung von Wahrheit 1): die Nordroute mit ungeprüften Halterungen, -## benannt im Start-Dialog, sichtbar im verkanteten Abschnitt am Ende. -## Marens Tod ist FIX und tritt unabhängig vom Permadeath-Toggle ein — -## das ist Story, kein Fail-State. Permadeath betrifft ausschließlich -## Tyrveils eigene Stürze (KillZone + Checkpoints wie am Viadukt). -## Sequenz beim Erreichen des manipulierten Abschnitts: Intervention -## (Maren geht dazwischen, nicht abbrechbar) -> Einsturz, Wren gerettet, -## Maren getroffen -> Sterbeszene mit Wahrheit 1 und 2 -> Trauer-Wahl -## Klinge/Herz (±15 Ton, Standing +2/+5) -> Beat gauntlet_completed. -## Beat-Kette und Persistenz: StorySystem. Nach dem Wendepunkt (erneutes -## Betreten) ist der Lauf frei begehbar, Maren und Wren sind fort. +## Der Parcours besteht aus fünf Ascent-Sub-Scenes an der Felswand, +## verbunden über schulterbreite Kies-Pfade; unten kaschiert Nebel den +## tausende Fuß tiefen Abgrund, oben warten die Drachen am Eingang der +## Box-Canyon. Komponenten am Root: gauntlet_mode (training/exam + +## manipulated), climb_controller (Griff + Descent-Sperre), +## safety_rope_system (Seilfang-QTE, +30 s), run_timer (Zeitlauf), +## rival_climbers (Live-Tode im Ernstlauf), nerve_system und +## dragon_distraction (baseline aus; per CR-003 ohne Wind-Ruck und ohne +## Gegensteuer-QTE — Wind gehört zum Viadukt, nicht zum Gauntlet). Die +## Treppe neben dem Lauf ist rein visuell (im Ernstlauf tabu, Zugang erst +## nach der Präsentation). +## +## Story (Phase 4c, unverändert): Der erste Lauf ist der manipulierte +## Ernstlauf — Marens Tod ist FIX und unabhängig vom Permadeath-Toggle. +## Sequenz am Sammel-Absatz vor Ascent 5: Intervention -> Einsturz, Wren +## gerettet, Maren getroffen -> Sterbeszene mit Wahrheit 1 und 2 -> +## Trauer-Wahl. Nach dem Wendepunkt ist der Lauf freies Training ohne +## Rivalen. story_hook_reached feuert an jedem Ascent-Übergang (Anker für +## den separaten Phase-4-Story-CR). + +signal ascent_completed(index: int) +signal obstacle_cleared(obstacle_id: String) +signal story_hook_reached(ascent_index: int) const MAIN_MENU_SCENE := "res://scenes/ui/main_menu.tscn" const START_PATH := "res://data/dialogue/gauntlet_start.json" const INTERVENTION_PATH := "res://data/dialogue/gauntlet_intervention.json" const DEATH_PATH := "res://data/dialogue/gauntlet_death.json" const GRIEF_PATH := "res://data/dialogue/gauntlet_grief.json" -const MAREN_ARRIVAL_POSITION := Vector3(1, 0.1, -80) -const MAREN_FALL_POSITION := Vector3(0.8, 0.1, -81.5) -const WREN_SAFE_POSITION := Vector3(-1, 0.1, -80) +const TUNING_PATH := "res://data/gauntlet/gauntlet_tuning.tres" +const ASCENT_CONFIG_PATHS: Array[String] = [ + "res://data/gauntlet/ascent_1.tres", + "res://data/gauntlet/ascent_2.tres", + "res://data/gauntlet/ascent_3.tres", + "res://data/gauntlet/ascent_4.tres", + "res://data/gauntlet/ascent_5.tres", +] +const BEHAVIOR_TUNABLES: Array[String] = [ + "log_spin_speed", "wheel_speed", "wheel_exit_window", "buoy_swing_period", + "launch_window", "momentum_charge_time", "hangel_rhythm_window", + "shake_amplitude", "shake_frequency", "roll_speed", "min_ascend_speed", + "crush_grace", "chimney_brace_tolerance", "chimney_drift_speed", + "ramp_min_momentum", +] +const MAREN_ARRIVAL_POSITION := Vector3(1, 26.45, -88.5) +const MAREN_FALL_POSITION := Vector3(0.8, 26.45, -89.8) +const WREN_SAFE_POSITION := Vector3(-1, 26.45, -88.5) +const BASE_SPAWN := Vector3(0, 0.1, 2) +const COURSE_START_Z := -4.0 +const GRAVEL_CENTERS: Array[Vector3] = [ + Vector3(0, 7.85, -26.5), + Vector3(0, 13.85, -45), + Vector3(0, 19.25, -73), + Vector3(0, 26.15, -90), +] +const GRAVEL_SIZES: Array[Vector3] = [ + Vector3(0.9, 0.3, 4), + Vector3(0.9, 0.3, 4), + Vector3(0.9, 0.3, 4), + Vector3(3, 0.3, 5), +] +const SPINE: Array[Vector3] = [ + Vector3(0, 0, -2), Vector3(0, 0.55, -6), Vector3(0, 5.3, -18), + Vector3(0, 8, -24.5), Vector3(0, 8, -28.5), Vector3(0, 14, -43), + Vector3(0, 14, -47), Vector3(0, 15.4, -61.8), Vector3(0, 19.4, -71), + Vector3(0, 19.4, -75), Vector3(0, 26.3, -87.5), Vector3(0, 26.3, -92.5), + Vector3(0, 32.6, -97.5), Vector3(0, 35.6, -103), Vector3(0, 37.6, -106), +] +const ASCENT_BREAKS := [-28.5, -47.0, -71.0, -87.5] +const NO_ROPE_RANGE := Vector2(-87.5, -75.0) +const RIVAL_CRUSH_ZONE := Vector2(-86.0, -76.0) -var _checkpoint_position := Vector3.ZERO +var _checkpoint_position := BASE_SPAWN var _has_intervention_run := false +var _has_run_started := false +var _reached_ascents: Dictionary = {} var _player: CharacterBody3D +var _dragons: Array[Node3D] = [] @onready var _maren: Node3D = $Maren @onready var _wren: Node3D = $Wren +@onready var _mode: Node = $GauntletMode +@onready var _climb: Node = $ClimbController +@onready var _nerve: Node = $NerveSystem +@onready var _ropes: Node3D = $SafetyRopeSystem +@onready var _timer: Node = $RunTimer +@onready var _rivals: Node3D = $RivalClimbers +@onready var _distraction: Node = $DragonDistraction -## Verbindet Checkpoints, KillZone und Interventions-Trigger; beim ersten -## Betreten startet der Auftakt-Dialog, nach dem Wendepunkt ist der Lauf -## leer und frei begehbar. +## Baut Kurs-Umgebung, lädt das Tuning, verdrahtet Komponenten und +## Hindernisse und initialisiert Modus und Story-Zustand. func _ready() -> void: _player = get_tree().get_first_node_in_group("player") + _build_course() + _apply_tuning() if _player != null: - _checkpoint_position = _player.global_position - for checkpoint in $Checkpoints.get_children(): - checkpoint.body_entered.connect(_on_checkpoint_entered.bind(checkpoint)) + _nerve.setup(_player, COURSE_START_Z) + _climb.setup(_player, _nerve, _mode, COURSE_START_Z) + var anchors: Array[Vector3] = [Vector3(0, 0, 0)] + for center in GRAVEL_CENTERS: + anchors.append(Vector3(center.x, center.y + 0.15, center.z)) + anchors.append(Vector3(0, 37.6, -106)) + var no_rope_ranges: Array[Vector2] = [NO_ROPE_RANGE] + _ropes.setup(_player, _mode, SPINE, anchors, no_rope_ranges, COURSE_START_Z) + _distraction.setup(_player, _nerve, _mode, _dragons, COURSE_START_Z) + _wire_obstacles() $KillZone.body_entered.connect(_on_kill_zone_entered) + _climb.climber_fell.connect(_on_climber_fell) + _ropes.rope_caught.connect(_on_rope_caught) + _ropes.catch_failed.connect(_on_catch_failed) + _rivals.rival_fell.connect(_on_rival_fell) + _init_mode_and_story() + + +## Startet den Zeitlauf, sobald Tyrveil den Parcours im Ernstlauf betritt. +func _physics_process(_delta: float) -> void: + if _has_run_started or _player == null: + return + if not _mode.is_exam() or DialogueSystem.is_dialogue_active: + return + if _player.global_position.z < -5.0: + _has_run_started = true + _timer.start_run() + _rivals.start() + + +## Initialisiert Modus und Story: Der erste Besuch ist der manipulierte +## Ernstlauf (Presentation Day), nach dem Wendepunkt freies Training. +func _init_mode_and_story() -> void: if StorySystem.has_reached_beat("maren_death"): _has_intervention_run = true + _mode.set_mode(_mode.Mode.TRAINING) + _mode.manipulated = false _maren.queue_free() _wren.queue_free() $CollapsingSection.queue_free() $InterventionTrigger.queue_free() return + _mode.set_mode(_mode.Mode.EXAM) + _mode.manipulated = true + _apply_manipulated_preset() + var haste: float = _mode.rival_haste_scale() + _rivals.setup(SPINE, PackedFloat32Array(ASCENT_BREAKS), RIVAL_CRUSH_ZONE, haste) $InterventionTrigger.body_entered.connect(_on_intervention_entered) _play_opening() @@ -66,29 +163,247 @@ func _play_opening() -> void: }) -## Setzt den Respawn-Punkt auf den erreichten Abschnitts-Checkpoint. -func _on_checkpoint_entered(body: Node3D, checkpoint: Area3D) -> void: +## Lädt gauntlet_tuning.tres und die Ascent-Configs und verteilt die +## Werte an Komponenten und Hindernisse (Verhaltens-Tunables; Geometrie- +## Werte stehen als Overrides direkt in den Ascent-Szenen). +func _apply_tuning() -> void: + var tuning: GauntletTuning = load(TUNING_PATH) + _ropes.rope_spacing = tuning.rope_spacing + _ropes.rope_catch_radius = tuning.rope_catch_radius + _ropes.rope_catch_window = tuning.rope_catch_window + _ropes.rope_time_penalty = tuning.rope_time_penalty + _climb.grip_max = tuning.grip_max + _climb.grip_drain_rate = tuning.grip_drain_rate + _climb.grip_regen_rate = tuning.grip_regen_rate + _nerve.nerve_max = tuning.nerve_max + _nerve.nerve_on_rival_fall = tuning.nerve_on_rival_fall + _nerve.nerve_on_distraction = tuning.nerve_on_distraction + _nerve.nerve_look_down_rate = tuning.nerve_look_down_rate + _nerve.nerve_calm_rate = tuning.nerve_calm_rate + _nerve.nerve_decay_rate = tuning.nerve_decay_rate + _nerve.nerve_grip_penalty = tuning.nerve_grip_penalty + _nerve.nerve_panic_threshold = tuning.nerve_panic_threshold + _nerve.panic_lockout = tuning.panic_lockout + _rivals.rival_count = tuning.rival_count + _rivals.rival_climb_speed = tuning.rival_climb_speed + _rivals.rival_fall_schedule = tuning.rival_fall_schedule + _rivals.rival_line_offsets = tuning.rival_line_offsets + _distraction.distraction_enabled_baseline = tuning.distraction_enabled_baseline + _distraction.distraction_interval_min = tuning.distraction_interval_min + _distraction.distraction_interval_max = tuning.distraction_interval_max + for i in ASCENT_CONFIG_PATHS.size(): + var config: AscentConfig = load(ASCENT_CONFIG_PATHS[i]) + var ascent := get_node("Ascent%d" % (i + 1)) + for obstacle in ascent.get_children(): + if obstacle is GauntletObstacle: + _apply_config_to_obstacle(config, obstacle) + + +## Überträgt die Verhaltens-Tunables einer Ascent-Config auf ein Hindernis. +func _apply_config_to_obstacle(config: AscentConfig, obstacle: GauntletObstacle) -> void: + for property in BEHAVIOR_TUNABLES: + if property in obstacle: + obstacle.set(property, config.get(property)) + + +## Verschärft die Hindernisse gemäß manipulated-Preset (Zeitfenster, +## Rollgeschwindigkeit); Rival- und Ablenkungs-Raffung übernehmen die +## Komponenten selbst über die Modus-Skalen. +func _apply_manipulated_preset() -> void: + for obstacle in get_tree().get_nodes_in_group("gauntlet_obstacle"): + if "wheel_exit_window" in obstacle: + obstacle.wheel_exit_window *= _mode.window_scale() + if "launch_window" in obstacle: + obstacle.launch_window *= _mode.window_scale() + if "roll_speed" in obstacle: + obstacle.roll_speed *= _mode.roll_speed_scale() + + +## Verbindet Kontext und Signale aller Hindernisse. +func _wire_obstacles() -> void: + for obstacle in get_tree().get_nodes_in_group("gauntlet_obstacle"): + obstacle.setup_context(_nerve, _mode) + obstacle.cleared.connect(_on_obstacle_cleared) + obstacle.player_fell.connect(_on_obstacle_fall) + if obstacle.has_signal("crushed"): + obstacle.crushed.connect(_on_crushed) + + +## Baut die Kurs-Umgebung: Fuß-Plattform, Kies-Pfade mit Rast-/Checkpoint- +## Zonen, Box-Canyon-Plattform mit Drachen, Treppen-Visual und Felswand. +func _build_course() -> void: + _build_platform(Vector3(0, -0.5, 0), Vector3(8, 1, 8)) + _build_rest_zone(Vector3(0, 1.5, 0), Vector3(8, 3, 8), 0) + for i in GRAVEL_CENTERS.size(): + _build_platform(GRAVEL_CENTERS[i], GRAVEL_SIZES[i]) + var zone_size := GRAVEL_SIZES[i] + Vector3(0.4, 2.0, 0.4) + var zone_center := GRAVEL_CENTERS[i] + Vector3(0, 1.0, 0) + _build_rest_zone(zone_center, zone_size, i + 1) + _build_platform(Vector3(0, 37.1, -109), Vector3(10, 1, 10)) + _build_rest_zone(Vector3(0, 38.6, -109), Vector3(10, 2, 10), 5) + for x in [-3.2, 3.2]: + add_child(_make_mesh(Vector3(2.5, 5, 4), Vector3(x, 40.1, -111), Color(0.4, 0.38, 0.36))) + var dragon_spots := [Vector3(-3, 37.6, -112), Vector3(-1, 37.6, -112.6), Vector3(1.5, 37.6, -112.2), Vector3(3.5, 37.6, -111.6)] + for spot in dragon_spots: + var dragon := _make_dragon(spot) + add_child(dragon) + _dragons.append(dragon) + var stairs := _make_mesh(Vector3(1.2, 0.5, 116), Vector3(5, 18.8, -54), Color(0.5, 0.48, 0.46)) + stairs.rotation.x = -atan2(37.6, 108.0) + add_child(stairs) + var cliff := _make_mesh(Vector3(1, 52, 124), Vector3(3.9, 20, -55), Color(0.36, 0.34, 0.33)) + add_child(cliff) + + +## Baut eine begehbare Plattform (Kies-Pfad, Fuß, Box-Canyon). +func _build_platform(center: Vector3, size: Vector3) -> void: + var body := StaticBody3D.new() + body.position = center + var shape := CollisionShape3D.new() + var box := BoxShape3D.new() + box.size = size + shape.shape = box + body.add_child(shape) + body.add_child(_make_mesh(size, Vector3.ZERO, Color(0.58, 0.55, 0.5))) + add_child(body) + + +## Baut eine Rast-Zone (Gruppe gauntlet_rest); index 1..4 sind zugleich +## Ascent-Übergänge/Checkpoints, 0 ist der Fuß, 5 die Box-Canyon. +func _build_rest_zone(center: Vector3, size: Vector3, index: int) -> void: + var area := Area3D.new() + area.collision_layer = 0 + area.collision_mask = 2 + area.position = center + area.add_to_group("gauntlet_rest") + var shape := CollisionShape3D.new() + var box := BoxShape3D.new() + box.size = size + shape.shape = box + area.add_child(shape) + area.body_entered.connect(_on_rest_zone_entered.bind(index, center.y)) + add_child(area) + + +## Baut ein reines Greybox-Mesh. +func _make_mesh(size: Vector3, position_offset: Vector3, color: Color) -> MeshInstance3D: + var mesh_instance := MeshInstance3D.new() + var mesh := BoxMesh.new() + mesh.size = size + var material := StandardMaterial3D.new() + material.albedo_color = color + mesh.material = material + mesh_instance.mesh = mesh + mesh_instance.position = position_offset + return mesh_instance + + +## Baut eine Drachen-Silhouette am Box-Canyon-Eingang. +func _make_dragon(spot: Vector3) -> Node3D: + var dragon := Node3D.new() + dragon.position = spot + var body := _make_mesh(Vector3(1.6, 1.4, 2.8), Vector3(0, 0.7, 0), Color(0.18, 0.14, 0.16)) + dragon.add_child(body) + var neck := _make_mesh(Vector3(0.5, 1.6, 0.5), Vector3(0, 1.8, 1.2), Color(0.18, 0.14, 0.16)) + dragon.add_child(neck) + return dragon + + +## Ascent-Übergang betreten: Checkpoint (Training), Fortschritts-Höhe für +## die Descent-Sperre, ascent_completed + story_hook_reached einmalig. +func _on_rest_zone_entered(body: Node3D, index: int, top_y: float) -> void: if not body.is_in_group("player"): return - _checkpoint_position = Vector3(checkpoint.global_position.x, 0.1, checkpoint.global_position.z) + _climb.set_progress_height(top_y) + if _mode.is_training(): + _checkpoint_position = _rest_checkpoint(index) + if index == 0 or _reached_ascents.has(index): + return + _reached_ascents[index] = true + ascent_completed.emit(index) + story_hook_reached.emit(index) + if index == 5: + _timer.stop_run() -## Sturz in den Abgrund: Game Over bei Permadeath AN, sonst Respawn — -## betrifft nur Tyrveil, nie den Story-Beat. +## Liefert den Respawn-Punkt einer Rast-Zone (Fuß, Kies-Pfad 1..4, +## Box-Canyon). +func _rest_checkpoint(index: int) -> Vector3: + if index == 0: + return BASE_SPAWN + if index <= 4: + var center := GRAVEL_CENTERS[index - 1] + return Vector3(center.x, center.y + 0.35, center.z) + return Vector3(0, 37.7, -109) + + +## Hindernis geschafft: Signal durchreichen; die Cliff Ledge beendet den +## Kurs zusätzlich über die Box-Canyon-Rast-Zone. +func _on_obstacle_cleared(obstacle_id: String) -> void: + obstacle_cleared.emit(obstacle_id) + + +## Fehlgriff an einem Hindernis: Seilfang-Versuch. +func _on_obstacle_fall(_source_id: String) -> void: + _ropes.attempt_catch() + + +## Griff leer, Descent-Sperre oder Gegensteuer-QTE verloren: Seilfang. +func _on_climber_fell() -> void: + _ropes.attempt_catch() + + +## Seilfang geglückt: Zeitstrafe auf den Lauf. +func _on_rope_caught(time_penalty: float) -> void: + if _timer.is_running: + _timer.add_penalty(time_penalty) + + +## Seilfang gescheitert oder unmöglich (No-Rope-Zone, kein Seil in +## Reichweite): Death-State. +func _on_catch_failed() -> void: + _handle_death() + + +## Rival-Sturz in Sicht: Nerven-Anstieg. +func _on_rival_fell(_rival_id: int, _ascent_index: int) -> void: + _nerve.add_nerve(_nerve.nerve_on_rival_fall) + + +## Quetschung an den Rolling Logs: sicherer Tod, kein Seilfang. +func _on_crushed() -> void: + _handle_death() + + +## Sturz in den Abgrund (KillZone). func _on_kill_zone_entered(body: Node3D) -> void: if not body.is_in_group("player"): return + _handle_death() + + +## Death-State: Game Over bei Permadeath AN; sonst Respawn am Checkpoint +## (Training) bzw. am Fuß mit neuem Zeitlauf (Ernstlauf) — betrifft nur +## Tyrveil, nie den Story-Beat. +func _handle_death() -> void: if GameState.is_permadeath_enabled: print("Game Over — der Gauntlet vergibt keine Fehler.") Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) get_tree().change_scene_to_file.call_deferred(MAIN_MENU_SCENE) return - body.velocity = Vector3.ZERO - body.global_position = _checkpoint_position + _player.external_push = Vector3.ZERO + _player.velocity = Vector3.ZERO + _climb.reset_grip() + if _mode.is_exam(): + _player.global_position = BASE_SPAWN + _timer.reset() + _has_run_started = false + else: + _player.global_position = _checkpoint_position -## Startet den Wendepunkt einmalig, sobald Tyrveil den manipulierten -## Abschnitt erreicht. +## Startet den Wendepunkt einmalig, sobald Tyrveil den Sammel-Absatz vor +## Ascent 5 erreicht. func _on_intervention_entered(body: Node3D) -> void: if not body.is_in_group("player"): return @@ -99,7 +414,8 @@ func _on_intervention_entered(body: Node3D) -> void: ## Spielt den kompletten Wendepunkt als Coroutine: Intervention, Einsturz, -## Sterbeszene mit den Wahrheiten, Trauer-Entscheidung. +## Sterbeszene mit den Wahrheiten, Trauer-Entscheidung; danach ist der +## Lauf freies Training. func _run_climax(player: CharacterBody3D) -> void: StorySystem.advance_gauntlet_beat("maren_intervention") _maren.global_position = MAREN_ARRIVAL_POSITION @@ -128,6 +444,11 @@ func _run_climax(player: CharacterBody3D) -> void: }) await DialogueSystem.dialogue_finished StorySystem.advance_gauntlet_beat("gauntlet_completed") + _timer.stop_run() + _mode.manipulated = false + _mode.set_mode(_mode.Mode.TRAINING) + _rivals.stop() + _checkpoint_position = Vector3(GRAVEL_CENTERS[3].x, GRAVEL_CENTERS[3].y + 0.35, GRAVEL_CENTERS[3].z) ## Legt Marens Mesh in Liegeposition; der Root bleibt aufrecht, damit diff --git a/scripts/gameplay/gauntlet_mode.gd b/scripts/gameplay/gauntlet_mode.gd new file mode 100644 index 0000000..2351152 --- /dev/null +++ b/scripts/gameplay/gauntlet_mode.gd @@ -0,0 +1,60 @@ +extends Node +## Gauntlet-Modus (CR-002): Training vs. Ernstlauf plus manipulated-Preset. +## +## training: Absteigen erlaubt, Kies-Pfade sind Checkpoints, Respawn am +## letzten Checkpoint. exam: Zeitlauf, kein Absteigen (Descent-Sperre im +## climb_controller), keine Zwischen-Checkpoints, Respawn am Fuß. Der +## manipulierte Story-Lauf (Phase 4) ist exam + manipulated: schärfere +## Zeitfenster, schnellere Stämme, aggressiverer rival_fall_schedule und +## kürzere Ablenkungsintervalle — die Multiplikatoren liegen hier als +## Preset, die Story-Schicht selbst füllt ein separater CR. + +enum Mode { TRAINING, EXAM } + +signal mode_changed(mode: int) + +@export var manipulated := false +@export var manipulated_window_mult := 0.75 +@export var manipulated_interval_mult := 0.55 +@export var manipulated_roll_speed_mult := 1.25 +@export var manipulated_rival_haste_mult := 0.6 + +var mode := Mode.TRAINING + + +## Setzt den Modus und meldet den Wechsel. +func set_mode(new_mode: int) -> void: + if mode == new_mode: + return + mode = new_mode + mode_changed.emit(mode) + + +## Training aktiv? +func is_training() -> bool: + return mode == Mode.TRAINING + + +## Ernstlauf aktiv? +func is_exam() -> bool: + return mode == Mode.EXAM + + +## Skaliert Reaktionsfenster (QTE, Hangel-Rhythmus, Rad-Ausstieg). +func window_scale() -> float: + return manipulated_window_mult if manipulated else 1.0 + + +## Skaliert Ablenkungs-Intervalle. +func interval_scale() -> float: + return manipulated_interval_mult if manipulated else 1.0 + + +## Skaliert die Rollgeschwindigkeit der Stämme. +func roll_speed_scale() -> float: + return manipulated_roll_speed_mult if manipulated else 1.0 + + +## Skaliert den Zeitplan der Rival-Stürze (früher = aggressiver). +func rival_haste_scale() -> float: + return manipulated_rival_haste_mult if manipulated else 1.0 diff --git a/scripts/gameplay/gauntlet_mode.gd.uid b/scripts/gameplay/gauntlet_mode.gd.uid new file mode 100644 index 0000000..a9b2f2c --- /dev/null +++ b/scripts/gameplay/gauntlet_mode.gd.uid @@ -0,0 +1 @@ +uid://brjldwpwyl7mc diff --git a/scripts/gameplay/gauntlet_tuning.gd b/scripts/gameplay/gauntlet_tuning.gd new file mode 100644 index 0000000..02ab5b8 --- /dev/null +++ b/scripts/gameplay/gauntlet_tuning.gd @@ -0,0 +1,37 @@ +class_name GauntletTuning +extends Resource +## Globales Tuning des Gauntlet-Parcours (CR-002), daten-getrieben unter +## data/gauntlet/gauntlet_tuning.tres. +## +## Bündelt die szenenweiten Werte: Sicherungsseile (Abstand, Fang-QTE, +## Zeitstrafe), Zeitlauf, Nerven-System, Rival-Kadetten und +## Drachen-Ablenkung. Die Hindernis-Werte pro Ascent liegen in den +## ascent_N.tres (AscentConfig). + +@export var rope_spacing := 1.8 +@export var rope_catch_radius := 3.5 +@export var rope_catch_window := 0.7 +@export var rope_time_penalty := 30.0 + +@export var grip_max := 100.0 +@export var grip_drain_rate := 3.5 +@export var grip_regen_rate := 30.0 + +@export var nerve_max := 100.0 +@export var nerve_on_rival_fall := 25.0 +@export var nerve_on_distraction := 15.0 +@export var nerve_look_down_rate := 12.0 +@export var nerve_calm_rate := 25.0 +@export var nerve_decay_rate := 2.0 +@export var nerve_grip_penalty := 1.5 +@export var nerve_panic_threshold := 85.0 +@export var panic_lockout := 2.5 + +@export var rival_count := 5 +@export var rival_climb_speed := 1.6 +@export var rival_fall_schedule: PackedFloat32Array = PackedFloat32Array([18.0, 42.0]) +@export var rival_line_offsets: PackedFloat32Array = PackedFloat32Array([-2.6, -1.8, 1.8, 2.6, -3.2]) + +@export var distraction_enabled_baseline := false +@export var distraction_interval_min := 6.0 +@export var distraction_interval_max := 12.0 diff --git a/scripts/gameplay/gauntlet_tuning.gd.uid b/scripts/gameplay/gauntlet_tuning.gd.uid new file mode 100644 index 0000000..a847a5a --- /dev/null +++ b/scripts/gameplay/gauntlet_tuning.gd.uid @@ -0,0 +1 @@ +uid://b5y0tsg7icqvo diff --git a/scripts/gameplay/nerve_system.gd b/scripts/gameplay/nerve_system.gd new file mode 100644 index 0000000..7910125 --- /dev/null +++ b/scripts/gameplay/nerve_system.gd @@ -0,0 +1,118 @@ +extends Node +## Nerven-/Fokus-System (CR-002 §8): koppelt Live-Tode ans Klettern. +## +## nerve steigt bei Rival-Stürzen in Sicht, Drachen-Ablenkung und beim +## bewussten Blick nach unten (Kamera-Pitch unter Schwelle oder +## look_down-Action, nur in der Höhe). Hoher nerve verschlechtert den +## Griff (grip_drain_factor) und verstärkt Balance-Drift (drift_factor). +## Gegenmittel: Steady/Atmen halten (Strg / L2) senkt nerve, sperrt aber +## die Steuerung — bewusster Zeit-Trade-off am Hang. Über der +## Panik-Schwelle ist Steady für panic_lockout Sekunden blockiert. + +signal nerve_state_changed(value: float) + +@export var nerve_max := 100.0 +@export var nerve_on_rival_fall := 25.0 +@export var nerve_on_distraction := 15.0 +@export var nerve_look_down_rate := 12.0 +@export var nerve_calm_rate := 25.0 +@export var nerve_decay_rate := 2.0 +@export var nerve_grip_penalty := 1.5 +@export var nerve_panic_threshold := 85.0 +@export var panic_lockout := 2.5 + +var nerve := 0.0 +var is_steadying := false + +var _player: CharacterBody3D +var _course_z := -4.0 +var _panic_timer := 0.0 +var _has_steady_lock := false +var _bar: ProgressBar + + +## Verknüpft den Spieler und die Kurs-Grenze (z, ab der der Parcours +## beginnt) und baut die HUD-Leiste. +func setup(player: CharacterBody3D, course_z: float) -> void: + _player = player + _course_z = course_z + _build_hud() + + +## Erhöht den Nerven-Wert (Rival-Sturz, Ablenkung). +func add_nerve(amount: float) -> void: + _set_nerve(nerve + amount) + + +## Griff-Malus: 1.0 (ruhig) bis 1.0 + nerve_grip_penalty (Panik). +func grip_drain_factor() -> float: + return 1.0 + nerve / nerve_max * nerve_grip_penalty + + +## Drift-Malus für Balance-Hindernisse (halb so stark wie der Griff-Malus). +func drift_factor() -> float: + return 1.0 + nerve / nerve_max * nerve_grip_penalty * 0.5 + + +## Treibt Blick-nach-unten, Steady und den langsamen Abbau an. +func _physics_process(delta: float) -> void: + if _player == null or DialogueSystem.is_dialogue_active: + return + _panic_timer = maxf(_panic_timer - delta, 0.0) + var is_in_course: bool = _player.global_position.z < _course_z + if is_in_course and _player.global_position.y > 4.0 and _is_looking_down(): + _set_nerve(nerve + nerve_look_down_rate * delta) + var wants_steady := Input.is_action_pressed("steady") and is_in_course and _panic_timer <= 0.0 + if wants_steady and (not _player.is_control_locked() or _has_steady_lock): + if not _has_steady_lock: + _player.set_control_locked(true) + _has_steady_lock = true + is_steadying = true + _set_nerve(nerve - nerve_calm_rate * delta) + else: + if _has_steady_lock: + _player.set_control_locked(false) + _has_steady_lock = false + is_steadying = false + _set_nerve(nerve - nerve_decay_rate * delta) + + +## Setzt den Nerven-Wert geklemmt, pflegt Panik-Sperre und HUD und meldet +## die Änderung. +func _set_nerve(value: float) -> void: + var clamped := clampf(value, 0.0, nerve_max) + if is_equal_approx(clamped, nerve): + return + if clamped >= nerve_panic_threshold and nerve < nerve_panic_threshold: + _panic_timer = panic_lockout + nerve = clamped + _bar.value = nerve + _bar.visible = nerve > 0.5 + nerve_state_changed.emit(nerve) + + +## Erkennt den bewussten Blick nach unten (Kamera-Pitch oder Action). +func _is_looking_down() -> bool: + if Input.is_action_pressed("look_down"): + return true + return _player.get_camera_pitch() < -0.85 + + +## Baut die schmale orange Nerven-Leiste über der Griff-Anzeige. +func _build_hud() -> void: + var layer := CanvasLayer.new() + layer.layer = 3 + var root := Control.new() + root.set_anchors_preset(Control.PRESET_FULL_RECT) + root.mouse_filter = Control.MOUSE_FILTER_IGNORE + _bar = ProgressBar.new() + _bar.set_anchors_preset(Control.PRESET_CENTER_BOTTOM) + _bar.position += Vector2(-150, -66) + _bar.custom_minimum_size = Vector2(300, 10) + _bar.max_value = nerve_max + _bar.show_percentage = false + _bar.modulate = Color(1.0, 0.55, 0.2) + _bar.visible = false + root.add_child(_bar) + layer.add_child(root) + add_child(layer) diff --git a/scripts/gameplay/nerve_system.gd.uid b/scripts/gameplay/nerve_system.gd.uid new file mode 100644 index 0000000..a522838 --- /dev/null +++ b/scripts/gameplay/nerve_system.gd.uid @@ -0,0 +1 @@ +uid://mcfov5b4ok4c diff --git a/scripts/gameplay/obstacles/buoy_ball.gd b/scripts/gameplay/obstacles/buoy_ball.gd new file mode 100644 index 0000000..7b37437 --- /dev/null +++ b/scripts/gameplay/obstacles/buoy_ball.gd @@ -0,0 +1,104 @@ +extends GauntletObstacle +## Buoy Ball (CR-002, ascent_2): hängende Kugel zum Umklammern und +## Anschwingen (momentum_swing, CR §8b). +## +## Die Kugel pendelt entlang der Laufrichtung. Springt der Spieler in die +## Greif-Zone, klammert er sich fest und pendelt mit. Schwung-Taste +## (Leertaste/A) halten lädt über momentum_charge_time den Schwung; +## Loslassen im Scheitel-Fenster (launch_window) katapultiert zur +## launch_target-Position (nächste Kugel oder Absatz). Zu früh/zu spät/ +## ungeladen gelöst -> zu kurz -> Sturz (player_fell). + +@export var buoy_swing_period := 2.4 +@export var swing_amplitude := 1.2 +@export var launch_window := 0.5 +@export var momentum_charge_time := 0.9 +@export var launch_target := Vector3(0, 1.2, -2.6) + +var _ball: MeshInstance3D +var _grab_area: Area3D +var _time := 0.0 +var _is_holding := false +var _charge := 0.0 +var _was_charging := false + + +## Baut Kugel, Seil-Visual und Greif-Zone. +func _ready() -> void: + super() + _ball = MeshInstance3D.new() + var sphere := SphereMesh.new() + sphere.radius = 0.5 + sphere.height = 1.0 + sphere.material = _make_material(Color(0.75, 0.3, 0.25)) + _ball.mesh = sphere + add_child(_ball) + add_child(build_box_mesh(Vector3(0.06, 2.4, 0.06), Vector3(0, 1.5, 0), Color(0.3, 0.28, 0.25))) + _grab_area = build_area(self, Vector3(2.2, 2.8, 2.2 + swing_amplitude * 2.0), Vector3(0, -0.9, 0)) + _grab_area.body_entered.connect(_on_grab) + + +## Pendelt die Kugel; hält der Spieler sich fest, folgt er ihr, lädt +## Schwung und wird beim Loslassen ausgewertet. +func _physics_process(delta: float) -> void: + _time += delta + var phase := _time * TAU / buoy_swing_period + _ball.position = Vector3(0, 0, sin(phase) * swing_amplitude) + _grab_area.position = _ball.position + Vector3(0, -0.9, 0) + if not _is_holding: + return + var player := get_player() + if player == null: + return + player.velocity = Vector3.ZERO + player.global_position = to_global(_ball.position + Vector3(0, -1.5, 0)) + var is_charging := Input.is_action_pressed("swing_charge") + if is_charging: + _charge = minf(_charge + delta / momentum_charge_time, 1.0) + show_prompt("Schwung laden: %d%% — im Scheitel loslassen (Leertaste / A-Taste)" % int(_charge * 100.0)) + elif _was_charging: + _release(player) + else: + show_prompt("Leertaste / A-Taste HALTEN — Schwung laden") + _was_charging = is_charging + + +## Klammert den Spieler an die Kugel, wenn er frei in die Greif-Zone kommt. +func _on_grab(body: Node3D) -> void: + if _is_holding or not body.is_in_group("player"): + return + var player := body as CharacterBody3D + if not is_player_free(player): + return + _is_holding = true + _charge = 0.0 + _was_charging = false + player.set_control_locked(true) + + +## Wertet das Loslassen aus: voll geladen im Scheitel-Fenster -> Launch zum +## Ziel, sonst zu kurz -> Sturz. +func _release(player: CharacterBody3D) -> void: + _is_holding = false + hide_prompt() + player.set_control_locked(false) + if _charge >= 1.0 and _is_in_launch_window(): + player.global_position = to_global(launch_target) + player.velocity = Vector3.ZERO + mark_cleared() + else: + player.velocity = Vector3(0, -8.0, 0) + report_fall() + + +## Prüft, ob das Pendel gerade im Scheitel-Fenster steht (Geschwindigkeit +## nahe null an den Umkehrpunkten). +func _is_in_launch_window() -> bool: + var phase := fposmod(_time * TAU / buoy_swing_period, PI) + var window_half := TAU * launch_window / buoy_swing_period / 2.0 + return absf(phase - PI / 2.0) < maxf(window_half, 0.15) + + +## Meldet, ob der Spieler gerade an der Kugel hängt (für Tests). +func is_holding() -> bool: + return _is_holding diff --git a/scripts/gameplay/obstacles/buoy_ball.gd.uid b/scripts/gameplay/obstacles/buoy_ball.gd.uid new file mode 100644 index 0000000..a456a29 --- /dev/null +++ b/scripts/gameplay/obstacles/buoy_ball.gd.uid @@ -0,0 +1 @@ +uid://ouipe8d7atdg diff --git a/scripts/gameplay/obstacles/cliff_ledge.gd b/scripts/gameplay/obstacles/cliff_ledge.gd new file mode 100644 index 0000000..615b91e --- /dev/null +++ b/scripts/gameplay/obstacles/cliff_ledge.gd @@ -0,0 +1,25 @@ +extends GauntletObstacle +## Cliff Ledge (CR-002, ascent_5): finaler Griffabsatz. +## +## Eine Felskante in Griffhöhe (ledge_reach) — der Sprung dagegen löst das +## bestehende Kanten-Klettersystem aus (Phase 1b), Tyrveil zieht sich hoch +## und der Kurs ist geschafft. Der Clear-Trigger oben meldet das Ende. + +@export var ledge_reach := 2.0 +@export var wall_width := 4.0 + +var _clear_trigger: Area3D + + +## Baut die Kantenwand und den Clear-Trigger auf der Oberseite. +func _ready() -> void: + super() + build_box(self, Vector3(wall_width, ledge_reach, 1.0), Vector3(0, ledge_reach / 2.0, 0), Color(0.5, 0.48, 0.46)) + _clear_trigger = build_area(self, Vector3(wall_width + 2.0, 2.4, 3.2), Vector3(0, ledge_reach + 1.0, -1.0)) + _clear_trigger.body_entered.connect(_on_top_reached) + + +## Oben angekommen: Hindernis (und damit der Kurs) geschafft. +func _on_top_reached(body: Node3D) -> void: + if body.is_in_group("player"): + mark_cleared() diff --git a/scripts/gameplay/obstacles/cliff_ledge.gd.uid b/scripts/gameplay/obstacles/cliff_ledge.gd.uid new file mode 100644 index 0000000..1105a37 --- /dev/null +++ b/scripts/gameplay/obstacles/cliff_ledge.gd.uid @@ -0,0 +1 @@ +uid://bbgq3utewlli8 diff --git a/scripts/gameplay/obstacles/granite_pillar.gd b/scripts/gameplay/obstacles/granite_pillar.gd new file mode 100644 index 0000000..dc2e07b --- /dev/null +++ b/scripts/gameplay/obstacles/granite_pillar.gd @@ -0,0 +1,15 @@ +extends GauntletObstacle +## Granit-Sprungpfeiler (CR-002, ascent_1) — statischer Greybox-Block. +## +## Dient zugleich als generische Plattform (Lande-Absätze, Ausstiege), +## da er nur aus einer konfigurierbaren Box besteht. Der Aufstieg über +## mehrere Pfeiler nutzt das bestehende Kanten-Klettersystem (jump). + +@export var size := Vector3(0.9, 1.7, 0.9) +@export var color := Color(0.55, 0.54, 0.52) + + +## Baut den Pfeiler; die Oberkante liegt bei position.y + size.y. +func _ready() -> void: + super() + build_box(self, size, Vector3(0, size.y / 2.0, 0), color) diff --git a/scripts/gameplay/obstacles/granite_pillar.gd.uid b/scripts/gameplay/obstacles/granite_pillar.gd.uid new file mode 100644 index 0000000..a133684 --- /dev/null +++ b/scripts/gameplay/obstacles/granite_pillar.gd.uid @@ -0,0 +1 @@ +uid://cq38s83h3f5bo diff --git a/scripts/gameplay/obstacles/iron_rail.gd b/scripts/gameplay/obstacles/iron_rail.gd new file mode 100644 index 0000000..4a3736d --- /dev/null +++ b/scripts/gameplay/obstacles/iron_rail.gd @@ -0,0 +1,109 @@ +extends GauntletObstacle +## Iron Rails (CR-002, ascent_3): waagerechte Schienen zum Hangeln. +## +## Baut rail_count Schienen Ende-an-Ende, jede um rail_height_step höher +## (Höhenversatz erzwingt Nachgreifen). Der Spieler springt an den Anfang, +## hängt darunter und hangelt Hand über Hand: A und D (bzw. LB/RB) im +## Wechsel, jeder korrekte Tap innerhalb hangel_rhythm_window schiebt ein +## Stück weiter. Falsche Hand oder Rhythmus gerissen -> Sturz +## (player_fell). Am Ende lässt Tyrveil sich auf den Lande-Absatz fallen. + +@export var rail_count := 3 +@export var rail_length := 4.0 +@export var rail_height_step := 0.15 +@export var rail_base_height := 2.6 +@export var hangel_rhythm_window := 1.1 +@export var hangel_step := 0.45 +@export var drop_target := Vector3(0, 1.4, -12.8) + +var _is_hanging := false +var _progress := 0.0 +var _expected_dir := -1 +var _rhythm_timer := 0.0 +var _total_length := 0.0 + + +## Baut die Schienen und die Greif-Zone am Anfang. +func _ready() -> void: + super() + _total_length = rail_length * float(rail_count) + for i in rail_count: + var y := rail_base_height + rail_height_step * float(i) + add_child(build_box_mesh(Vector3(0.12, 0.12, rail_length), Vector3(0, y, -rail_length / 2.0 - rail_length * float(i)), Color(0.35, 0.35, 0.4))) + var grab := build_area(self, Vector3(1.6, 1.8, 1.2), Vector3(0, rail_base_height - 1.0, -0.4)) + grab.body_entered.connect(_on_grab) + + +## Führt den hängenden Spieler und wertet den Hangel-Rhythmus aus. +func _physics_process(delta: float) -> void: + if not _is_hanging: + return + var player := get_player() + if player == null: + return + var rail_index := clampi(int(_progress / rail_length), 0, rail_count - 1) + var y := rail_base_height + rail_height_step * float(rail_index) + player.velocity = Vector3.ZERO + player.global_position = to_global(Vector3(0, y - 1.75, -_progress)) + _rhythm_timer += delta + var window := hangel_rhythm_window + if mode != null: + window *= mode.window_scale() + if _rhythm_timer > window: + _fail(player) + return + var next_hand := "A / LB" if _expected_dir < 0 else "D / RB" + show_prompt("Hangeln: %s — Hand über Hand im Wechsel" % next_hand) + var pressed_dir := 0 + if Input.is_action_just_pressed("hangel_left"): + pressed_dir = -1 + elif Input.is_action_just_pressed("hangel_right"): + pressed_dir = 1 + if pressed_dir == 0: + return + if pressed_dir != _expected_dir: + _fail(player) + return + _expected_dir = -_expected_dir + _rhythm_timer = 0.0 + _progress += hangel_step + if _progress >= _total_length: + _finish(player) + + +## Hängt den Spieler an die erste Schiene, wenn er frei zugreift. +func _on_grab(body: Node3D) -> void: + if _is_hanging or not body.is_in_group("player"): + return + var player := body as CharacterBody3D + if not is_player_free(player): + return + _is_hanging = true + _progress = 0.3 + _expected_dir = -1 + _rhythm_timer = 0.0 + player.set_control_locked(true) + + +## Ende erreicht: auf den Lande-Absatz fallen lassen. +func _finish(player: CharacterBody3D) -> void: + _is_hanging = false + hide_prompt() + player.set_control_locked(false) + player.global_position = to_global(drop_target) + player.velocity = Vector3.ZERO + mark_cleared() + + +## Rhythmus gerissen oder falsche Hand: Sturz. +func _fail(player: CharacterBody3D) -> void: + _is_hanging = false + hide_prompt() + player.set_control_locked(false) + player.velocity = Vector3.ZERO + report_fall() + + +## Meldet, ob der Spieler gerade hangelt (für Tests). +func is_hanging() -> bool: + return _is_hanging diff --git a/scripts/gameplay/obstacles/iron_rail.gd.uid b/scripts/gameplay/obstacles/iron_rail.gd.uid new file mode 100644 index 0000000..030aeda --- /dev/null +++ b/scripts/gameplay/obstacles/iron_rail.gd.uid @@ -0,0 +1 @@ +uid://4tnoonm8372n diff --git a/scripts/gameplay/obstacles/leaning_chimney.gd b/scripts/gameplay/obstacles/leaning_chimney.gd new file mode 100644 index 0000000..b6e61c2 --- /dev/null +++ b/scripts/gameplay/obstacles/leaning_chimney.gd @@ -0,0 +1,106 @@ +extends GauntletObstacle +## Leaning Chimney (CR-002, ascent_5): schräger Kaminschacht, X-Spreiz. +## +## Tyrveil spreizt sich direkt zwischen die beiden Wände (Standard-Technik, +## KEIN Seil-Behelf — der Behelf der Buch-Protagonistin für kleinere +## Kletterer wird bewusst nicht gebaut, nur hier vermerkt). Mini-Modus: +## W/Stick hoch schiebt eine Spreiz-Stufe hoch, A/D hält den Spreizdruck +## balanciert, während der Druck zufällig wegdriftet (Nerven-System +## verstärkt die Drift). Kippt die Balance über chimney_brace_tolerance, +## rutscht Tyrveil ab (player_fell). + +@export var chimney_height := 6.0 +@export var step_height := 1.0 +@export var chimney_brace_tolerance := 0.5 +@export var chimney_drift_speed := 0.45 +@export var exit_target := Vector3(0, 6.3, -2.5) + +var _is_bracing := false +var _height := 0.0 +var _balance := 0.0 +var _drift_dir := 1.0 + + +## Baut die beiden geneigten Kaminwände und die Einstiegs-Zone am Fuß. +func _ready() -> void: + super() + var lean := deg_to_rad(10.0) + for side in [-1.0, 1.0]: + var wall := build_box(self, Vector3(0.5, chimney_height + 2.0, 2.4), Vector3(side * 1.05, chimney_height / 2.0, -1.0), Color(0.5, 0.48, 0.46)) + wall.rotation.z = lean * side * 0.35 + var entry := build_area(self, Vector3(1.4, 1.6, 1.8), Vector3(0, 0.8, -1.0)) + entry.body_entered.connect(_on_entry) + + +## Treibt den Spreiz-Modus: Drift auf die Balance, A/D hält dagegen, +## W schiebt stufenweise hoch. +func _physics_process(delta: float) -> void: + if not _is_bracing: + return + var player := get_player() + if player == null: + return + player.velocity = Vector3.ZERO + player.global_position = to_global(Vector3(_balance * 0.4, _height + 0.9, -1.0)) + var drift := chimney_drift_speed + if nerve != null: + drift *= nerve.drift_factor() + _balance += drift * _drift_dir * delta + var axis := Input.get_axis("move_left", "move_right") + _balance += axis * 1.6 * delta + if absf(_balance) > chimney_brace_tolerance: + _slip(player) + return + show_prompt("X-SPREIZ — W/Stick hoch: Stufe · A/D: Druck halten [%s]" % _balance_bar()) + if Input.is_action_just_pressed("move_forward"): + _height += step_height + _drift_dir = 1.0 if randf() < 0.5 else -1.0 + if _height >= chimney_height: + _finish(player) + + +## Startet den Spreiz-Modus am Kaminfuß. +func _on_entry(body: Node3D) -> void: + if _is_bracing or not body.is_in_group("player"): + return + var player := body as CharacterBody3D + if not is_player_free(player): + return + _is_bracing = true + _height = 0.4 + _balance = 0.0 + _drift_dir = 1.0 if randf() < 0.5 else -1.0 + player.set_control_locked(true) + + +## Oben angekommen: auf den Ausstiegs-Absatz steigen. +func _finish(player: CharacterBody3D) -> void: + _is_bracing = false + hide_prompt() + player.set_control_locked(false) + player.global_position = to_global(exit_target) + player.velocity = Vector3.ZERO + mark_cleared() + + +## Spreizdruck gekippt: Abrutschen. +func _slip(player: CharacterBody3D) -> void: + _is_bracing = false + hide_prompt() + player.set_control_locked(false) + player.velocity = Vector3.ZERO + report_fall() + + +## Baut eine kleine Text-Anzeige der Balance-Lage für den Prompt. +func _balance_bar() -> String: + var slot := clampi(int(roundf(_balance / chimney_brace_tolerance * 3.0)), -3, 3) + var bar := "" + for i in range(-3, 4): + bar += "o" if i == slot else "-" + return bar + + +## Meldet, ob der Spieler gerade im Kamin spreizt (für Tests). +func is_bracing() -> bool: + return _is_bracing diff --git a/scripts/gameplay/obstacles/leaning_chimney.gd.uid b/scripts/gameplay/obstacles/leaning_chimney.gd.uid new file mode 100644 index 0000000..0e29f83 --- /dev/null +++ b/scripts/gameplay/obstacles/leaning_chimney.gd.uid @@ -0,0 +1 @@ +uid://rgb8it7gggna diff --git a/scripts/gameplay/obstacles/obstacle_base.gd b/scripts/gameplay/obstacles/obstacle_base.gd new file mode 100644 index 0000000..4afb6b1 --- /dev/null +++ b/scripts/gameplay/obstacles/obstacle_base.gd @@ -0,0 +1,153 @@ +class_name GauntletObstacle +extends Node3D +## Basisklasse aller Gauntlet-Hindernisse (CR-002). +## +## Liefert die gemeinsame Infrastruktur: Signale cleared/player_fell, +## Greybox-Baukasten für Boxen, Zylinder und Trigger-Areas, Zugriff auf +## den Spieler sowie einen Bildschirm-Prompt (Tastatur- UND +## Controller-Glyphe als Text, solange InputPrompts noch Skelett ist). +## Hindernisse registrieren sich in der Gruppe gauntlet_obstacle; die +## Szenen-Steuerung injiziert über setup_context Nerven-System und Modus. + +signal cleared(obstacle_id: String) +signal player_fell(source_id: String) + +@export var obstacle_id := "" + +var nerve: Node +var mode: Node +var _is_cleared := false +var _prompt_layer: CanvasLayer +var _prompt_label: Label + + +## Registriert das Hindernis für die Kontext-Injektion der Szene. +func _ready() -> void: + add_to_group("gauntlet_obstacle") + + +## Bekommt Nerven-System und Gauntlet-Modus von der Szene gereicht. +func setup_context(nerve_system: Node, gauntlet_mode: Node) -> void: + nerve = nerve_system + mode = gauntlet_mode + + +## Meldet das Hindernis einmalig als geschafft. +func mark_cleared() -> void: + if _is_cleared: + return + _is_cleared = true + cleared.emit(obstacle_id) + + +## Meldet einen Sturz des Spielers an diesem Hindernis. +func report_fall() -> void: + player_fell.emit(obstacle_id) + + +## Liefert den Spieler oder null. +func get_player() -> CharacterBody3D: + return get_tree().get_first_node_in_group("player") as CharacterBody3D + + +## Prüft, ob der Spieler gerade frei steuerbar ist (kein Dialog, kein +## anderes Set-Piece hält ihn fest). +func is_player_free(player: CharacterBody3D) -> bool: + return player != null and not DialogueSystem.is_dialogue_active and not player.is_control_locked() + + +## Baut eine begehbare Greybox-Box (Kollision + Mesh) als Kind von parent. +func build_box(parent: Node3D, box_size: Vector3, local_position: Vector3, color: Color) -> StaticBody3D: + var body := StaticBody3D.new() + body.position = local_position + var shape := CollisionShape3D.new() + var box := BoxShape3D.new() + box.size = box_size + shape.shape = box + body.add_child(shape) + body.add_child(build_box_mesh(box_size, Vector3.ZERO, color)) + parent.add_child(body) + return body + + +## Baut ein reines Box-Mesh ohne Kollision (Deko/Silhouetten). +func build_box_mesh(box_size: Vector3, local_position: Vector3, color: Color) -> MeshInstance3D: + var mesh_instance := MeshInstance3D.new() + var mesh := BoxMesh.new() + mesh.size = box_size + mesh.material = _make_material(color) + mesh_instance.mesh = mesh + mesh_instance.position = local_position + return mesh_instance + + +## Baut ein Zylinder-Mesh ohne Kollision (rotierende Stämme, Räder). +func build_cylinder_mesh(radius: float, height: float, local_position: Vector3, color: Color) -> MeshInstance3D: + var mesh_instance := MeshInstance3D.new() + var mesh := CylinderMesh.new() + mesh.top_radius = radius + mesh.bottom_radius = radius + mesh.height = height + mesh.material = _make_material(color) + mesh_instance.mesh = mesh + mesh_instance.position = local_position + return mesh_instance + + +## Baut eine Trigger-Area mit Box-Shape, die nur den Spieler (Layer 2) +## erkennt. +func build_area(parent: Node3D, box_size: Vector3, local_position: Vector3) -> Area3D: + var area := Area3D.new() + area.collision_layer = 0 + area.collision_mask = 2 + area.position = local_position + var shape := CollisionShape3D.new() + var box := BoxShape3D.new() + box.size = box_size + shape.shape = box + area.add_child(shape) + parent.add_child(area) + return area + + +## Zeigt einen zentrierten Bildschirm-Prompt (baut die UI beim ersten +## Aufruf lazy auf). +func show_prompt(text: String) -> void: + if _prompt_label == null: + _build_prompt_ui() + _prompt_label.text = text + _prompt_label.visible = true + + +## Blendet den Bildschirm-Prompt aus. +func hide_prompt() -> void: + if _prompt_label != null: + _prompt_label.visible = false + + +## Baut die Prompt-UI (CanvasLayer + Label, unteres Drittel). +func _build_prompt_ui() -> void: + _prompt_layer = CanvasLayer.new() + _prompt_layer.layer = 3 + var root := Control.new() + root.set_anchors_preset(Control.PRESET_FULL_RECT) + root.mouse_filter = Control.MOUSE_FILTER_IGNORE + _prompt_label = Label.new() + _prompt_label.set_anchors_preset(Control.PRESET_CENTER_BOTTOM) + _prompt_label.position.y -= 140.0 + _prompt_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER + _prompt_label.add_theme_font_size_override("font_size", 30) + _prompt_label.add_theme_color_override("font_color", Color(1, 0.85, 0.4)) + _prompt_label.add_theme_color_override("font_outline_color", Color.BLACK) + _prompt_label.add_theme_constant_override("outline_size", 8) + _prompt_label.visible = false + root.add_child(_prompt_label) + _prompt_layer.add_child(root) + add_child(_prompt_layer) + + +## Erstellt ein einfarbiges Greybox-Material. +func _make_material(color: Color) -> StandardMaterial3D: + var material := StandardMaterial3D.new() + material.albedo_color = color + return material diff --git a/scripts/gameplay/obstacles/obstacle_base.gd.uid b/scripts/gameplay/obstacles/obstacle_base.gd.uid new file mode 100644 index 0000000..94d1eed --- /dev/null +++ b/scripts/gameplay/obstacles/obstacle_base.gd.uid @@ -0,0 +1 @@ +uid://cwaxvssvere1d diff --git a/scripts/gameplay/obstacles/rolling_log.gd b/scripts/gameplay/obstacles/rolling_log.gd new file mode 100644 index 0000000..875ddd1 --- /dev/null +++ b/scripts/gameplay/obstacles/rolling_log.gd @@ -0,0 +1,59 @@ +extends GauntletObstacle +## Rolling Log (CR-002, ascent_4): rollender Stamm, Quetsch-Hazard. +## +## Der Stamm liegt quer zur Laufrichtung und rollt; wer auf ihm steht, +## wird mit roll_speed entlang der Laufrichtung geschoben (roll_dir +## bestimmt, ob bergauf oder bergab) — Tempo-Pflicht: Stillstand rollt +## Tyrveil in den Spalt zum nächsten Stamm. Die Quetsch-Zone unterhalb +## der Oberkante meldet crushed — dort gibt es KEINEN Seilfang +## (no_rope_zone, Kanon: tödlichster Punkt des Laufs). + +signal crushed + +@export var log_length := 4.0 +@export var log_radius := 0.5 +@export var roll_dir := 1 +@export var roll_speed := 1.4 + +var _visual: MeshInstance3D +var _was_on_log := false + + +## Baut Lauf-Box, rollenden Zylinder (Achse quer, x) und Quetsch-Zone am +## bergseitigen Spalt. +func _ready() -> void: + super() + build_box(self, Vector3(log_length, log_radius * 2.0, 1.0), Vector3(0, -log_radius, 0), Color(0.5, 0.4, 0.3)) + _visual = build_cylinder_mesh(log_radius + 0.05, log_length, Vector3(0, -log_radius, 0), Color(0.42, 0.33, 0.24)) + _visual.rotation.z = PI / 2.0 + add_child(_visual) + var crush_zone := build_area(self, Vector3(log_length - 0.4, 0.9, 0.7), Vector3(0, -log_radius - 0.6, -1.0)) + crush_zone.body_entered.connect(_on_crush) + + +## Rollt das Visual und schiebt den stehenden Spieler in Rollrichtung. +func _physics_process(delta: float) -> void: + _visual.rotate_object_local(Vector3.UP, roll_speed / maxf(log_radius, 0.1) * delta * float(roll_dir)) + var player := get_player() + if player == null: + return + var is_on_log := _is_player_on_log(player) + if is_on_log and is_player_free(player): + player.external_push = Vector3(0, 0, roll_speed * float(roll_dir)) + _was_on_log = true + elif _was_on_log: + player.external_push = Vector3.ZERO + _was_on_log = false + + +## Meldet die Quetschung zwischen zwei Stämmen (sicherer Tod, kein Seil). +func _on_crush(body: Node3D) -> void: + if body.is_in_group("player"): + crushed.emit() + + +## Prüft, ob der Spieler auf der Stamm-Oberkante steht. +func _is_player_on_log(player: CharacterBody3D) -> bool: + var local := to_local(player.global_position) + return absf(local.x) < log_length / 2.0 and absf(local.z) < 0.8 \ + and local.y > -0.2 and local.y < 1.4 diff --git a/scripts/gameplay/obstacles/rolling_log.gd.uid b/scripts/gameplay/obstacles/rolling_log.gd.uid new file mode 100644 index 0000000..ce45a35 --- /dev/null +++ b/scripts/gameplay/obstacles/rolling_log.gd.uid @@ -0,0 +1 @@ +uid://b2x6chhtnpjmg diff --git a/scripts/gameplay/obstacles/shaking_pillar.gd b/scripts/gameplay/obstacles/shaking_pillar.gd new file mode 100644 index 0000000..d01962b --- /dev/null +++ b/scripts/gameplay/obstacles/shaking_pillar.gd @@ -0,0 +1,48 @@ +extends GauntletObstacle +## Shaking Pillar (CR-002, ascent_3): wackelnder Sprungpfeiler. +## +## Der ganze Pfeiler oszilliert seitlich (shake_amplitude/shake_frequency); +## wer auf ihm steht, bekommt zusätzlich eine Drift auf external_push und +## hält mit A/D dagegen (Balance-Prinzip aus CR-001). Das Nerven-System +## verstärkt die Drift. + +@export var size := Vector3(1.1, 2.2, 1.1) +@export var shake_amplitude := 0.35 +@export var shake_frequency := 2.0 + +var _body: StaticBody3D +var _time := 0.0 +var _was_on_pillar := false + + +## Baut den Pfeiler; die Oberkante liegt bei position.y + size.y. +func _ready() -> void: + super() + _body = build_box(self, size, Vector3(0, size.y / 2.0, 0), Color(0.6, 0.5, 0.45)) + + +## Oszilliert den Pfeiler und lässt die Drift am stehenden Spieler zerren. +func _physics_process(delta: float) -> void: + _time += delta + var offset := sin(_time * shake_frequency * TAU) * shake_amplitude + _body.position.x = offset + var player := get_player() + if player == null: + return + var is_on_pillar := _is_player_on_pillar(player) + if is_on_pillar and is_player_free(player): + var drift := cos(_time * shake_frequency * TAU) * shake_amplitude * shake_frequency * TAU * 0.35 + if nerve != null: + drift *= nerve.drift_factor() + player.external_push = Vector3(drift, 0.0, 0.0) + _was_on_pillar = true + elif _was_on_pillar: + player.external_push = Vector3.ZERO + _was_on_pillar = false + + +## Prüft, ob der Spieler auf der Pfeiler-Oberkante steht. +func _is_player_on_pillar(player: CharacterBody3D) -> bool: + var local := to_local(player.global_position) + return absf(local.x) < 1.1 and absf(local.z) < 1.1 \ + and local.y > size.y - 0.3 and local.y < size.y + 1.2 diff --git a/scripts/gameplay/obstacles/shaking_pillar.gd.uid b/scripts/gameplay/obstacles/shaking_pillar.gd.uid new file mode 100644 index 0000000..c75db5b --- /dev/null +++ b/scripts/gameplay/obstacles/shaking_pillar.gd.uid @@ -0,0 +1 @@ +uid://dhel3jtpu7l2l diff --git a/scripts/gameplay/obstacles/spinning_log.gd b/scripts/gameplay/obstacles/spinning_log.gd new file mode 100644 index 0000000..997f3fa --- /dev/null +++ b/scripts/gameplay/obstacles/spinning_log.gd @@ -0,0 +1,52 @@ +extends GauntletObstacle +## Spinning Log (CR-002, ascent_1): rotierender Balken zum Drüberlaufen. +## +## Die Kollision ist eine schmale Lauf-Box, der sichtbare Zylinder dreht +## sich um die Längsachse (Laufrichtung -z). Solange der Spieler auf dem +## Balken steht, schiebt die Drehung ihn seitlich (external_push wie beim +## Viadukt-Wind); mit A/D bzw. Stick wird gegengehalten. Das Nerven-System +## verstärkt die Drift. Runter = Sturz (player_fell meldet ihn dem +## Seilfang-System). + +@export var log_length := 4.6 +@export var log_radius := 0.35 +@export var log_spin_speed := 2.0 + +var _visual: MeshInstance3D +var _was_on_log := false + + +## Baut Lauf-Box und Zylinder-Visual entlang -z. +func _ready() -> void: + super() + var center := Vector3(0, log_radius, -log_length / 2.0) + build_box(self, Vector3(0.6, log_radius * 2.0, log_length), center, Color(0.5, 0.42, 0.32)) + _visual = build_cylinder_mesh(log_radius + 0.05, log_length, center, Color(0.45, 0.36, 0.26)) + _visual.rotation.x = PI / 2.0 + add_child(_visual) + + +## Dreht das Visual und schiebt den Spieler seitlich, solange er auf dem +## Balken steht. +func _physics_process(delta: float) -> void: + _visual.rotate_object_local(Vector3.UP, log_spin_speed * delta) + var player := get_player() + if player == null: + return + var is_on_log := _is_player_on_log(player) + if is_on_log and is_player_free(player): + var drift := log_spin_speed * log_radius + if nerve != null: + drift *= nerve.drift_factor() + player.external_push = Vector3(drift, 0.0, 0.0) + _was_on_log = true + elif _was_on_log: + player.external_push = Vector3.ZERO + _was_on_log = false + + +## Prüft, ob der Spieler im Lauf-Bereich über dem Balken steht. +func _is_player_on_log(player: CharacterBody3D) -> bool: + var local := to_local(player.global_position) + return absf(local.x) < 0.6 and local.z < 0.4 and local.z > -log_length - 0.4 \ + and local.y > log_radius and local.y < log_radius * 2.0 + 1.4 diff --git a/scripts/gameplay/obstacles/spinning_log.gd.uid b/scripts/gameplay/obstacles/spinning_log.gd.uid new file mode 100644 index 0000000..56c4723 --- /dev/null +++ b/scripts/gameplay/obstacles/spinning_log.gd.uid @@ -0,0 +1 @@ +uid://mxhp56awl4s1 diff --git a/scripts/gameplay/obstacles/spinning_wheel.gd b/scripts/gameplay/obstacles/spinning_wheel.gd new file mode 100644 index 0000000..551d2b4 --- /dev/null +++ b/scripts/gameplay/obstacles/spinning_wheel.gd @@ -0,0 +1,109 @@ +extends GauntletObstacle +## Spinning Wheel (CR-002, ascent_1): großes, konstant drehendes Rad. +## +## Der Spieler springt unten in die Einstiegs-Zone, wird auf der Kreisbahn +## (y/z-Ebene) mitgedreht und muss den Ausstieg oben timen: Sprung-Taste +## im Fenster wheel_exit_window um den Scheitel drückt ihn auf die +## Ausstiegs-Plattform, ein Sprung außerhalb des Fensters wirft ihn ab +## (player_fell). Ohne Tastendruck dreht das Rad einfach weiter — die +## nächste Umdrehung ist die nächste Chance. Zwei Dummy-Kadetten drehen +## als Timing-Referenz sichtbar mit. + +@export var wheel_diameter := 4.0 +@export var wheel_speed := 0.8 +@export var wheel_exit_window := 0.45 +@export var exit_platform_offset := Vector3(0, -0.3, -2.0) + +var _pivot: Node3D +var _is_riding := false +var _ride_angle := 0.0 + + +## Baut Rad-Visual (Speichen + Kranz-Segmente), Dummy-Kadetten, +## Einstiegs-Zone und Ausstiegs-Plattform. +func _ready() -> void: + super() + var radius := wheel_diameter / 2.0 + _pivot = Node3D.new() + add_child(_pivot) + for i in 8: + var angle := TAU * float(i) / 8.0 + var segment := build_box_mesh(Vector3(0.5, 0.25, 1.7), Vector3(0, sin(angle) * radius, cos(angle) * radius), Color(0.5, 0.4, 0.3)) + segment.rotation.x = -angle + _pivot.add_child(segment) + for i in 2: + var cadet := build_box_mesh(Vector3(0.5, 1.4, 0.5), Vector3.ZERO, Color(0.35, 0.35, 0.5)) + cadet.name = "DummyCadet%d" % (i + 1) + _pivot.add_child(cadet) + var entry := build_area(self, Vector3(2.0, 1.6, 1.6), Vector3(0, -radius + 0.6, 1.2)) + entry.body_entered.connect(_on_entry) + var platform := build_box(self, Vector3(1.8, 0.4, 1.8), Vector3(exit_platform_offset.x, radius + exit_platform_offset.y, exit_platform_offset.z), Color(0.55, 0.54, 0.52)) + platform.name = "ExitPlatform" + + +## Dreht Rad und Dummy-Kadetten; während der Fahrt wird der Spieler auf +## der Kreisbahn geführt und der Ausstieg abgefragt. +func _physics_process(delta: float) -> void: + _pivot.rotate_x(-wheel_speed * delta) + var radius := wheel_diameter / 2.0 + _pivot.get_node("DummyCadet1").position = Vector3(0.8, sin(_ride_angle + 2.1) * (radius - 0.9), cos(_ride_angle + 2.1) * (radius - 0.9)) + _pivot.get_node("DummyCadet2").position = Vector3(-0.8, sin(_ride_angle + 4.2) * (radius - 0.9), cos(_ride_angle + 4.2) * (radius - 0.9)) + if not _is_riding: + return + _ride_angle += wheel_speed * delta + var player := get_player() + if player == null: + return + player.velocity = Vector3.ZERO + player.global_position = to_global(Vector3(0, -cos(_ride_angle) * (radius - 1.0), sin(_ride_angle) * (radius - 1.0))) + var is_in_window := _is_in_exit_window() + if is_in_window: + show_prompt("JETZT ABSPRINGEN! — Leertaste / A-Taste") + else: + show_prompt("Ausstieg oben timen — Leertaste / A-Taste im Fenster") + if Input.is_action_just_pressed("jump"): + if is_in_window: + _finish_ride(true) + else: + _finish_ride(false) + + +## Startet die Fahrt, wenn der Spieler frei in die Einstiegs-Zone springt. +func _on_entry(body: Node3D) -> void: + if _is_riding or not body.is_in_group("player"): + return + var player := body as CharacterBody3D + if not is_player_free(player): + return + _is_riding = true + _ride_angle = 0.2 + player.set_control_locked(true) + + +## Beendet die Fahrt: Erfolg setzt auf die Ausstiegs-Plattform, ein +## vertimter Absprung wirft den Spieler ab. +func _finish_ride(is_success: bool) -> void: + _is_riding = false + hide_prompt() + var player := get_player() + player.set_control_locked(false) + if is_success: + var radius := wheel_diameter / 2.0 + player.global_position = to_global(Vector3(exit_platform_offset.x, radius + exit_platform_offset.y + 0.4, exit_platform_offset.z)) + player.velocity = Vector3.ZERO + mark_cleared() + else: + player.velocity = Vector3(2.0, 1.0, 0.0) + report_fall() + + +## Prüft, ob die Fahrt gerade im Ausstiegs-Fenster um den Rad-Scheitel ist. +func _is_in_exit_window() -> bool: + var apex_phase := fposmod(_ride_angle, TAU) + var window_half := wheel_speed * wheel_exit_window / 2.0 + return absf(apex_phase - PI) < maxf(window_half, 0.12) + + +## Meldet, ob der Spieler gerade im Rad mitfährt (für Tests). +func is_riding() -> bool: + return _is_riding diff --git a/scripts/gameplay/obstacles/spinning_wheel.gd.uid b/scripts/gameplay/obstacles/spinning_wheel.gd.uid new file mode 100644 index 0000000..9fd64bc --- /dev/null +++ b/scripts/gameplay/obstacles/spinning_wheel.gd.uid @@ -0,0 +1 @@ +uid://yr8ljgmk6wdl diff --git a/scripts/gameplay/obstacles/vertical_ramp.gd b/scripts/gameplay/obstacles/vertical_ramp.gd new file mode 100644 index 0000000..4228163 --- /dev/null +++ b/scripts/gameplay/obstacles/vertical_ramp.gd @@ -0,0 +1,51 @@ +extends GauntletObstacle +## Vertical Ramp (CR-002, ascent_5): steile Holzrampe zum Hochsprinten. +## +## Die Rampe ist begehbar, drückt aber bergab: Nur mit Sprint-Momentum +## (ramp_min_momentum) kommt Tyrveil dagegen an, im Gehen rutscht sie +## zurück. Greybox über external_push hangabwärts, solange der Spieler +## ohne ausreichendes Tempo auf der Rampe steht. + +@export var ramp_height := 3.0 +@export var ramp_length := 3.6 +@export var ramp_min_momentum := 5.0 +@export var slide_back_push := 3.0 + +var _ramp: StaticBody3D +var _was_on_ramp := false + + +## Baut die geneigte Holzfläche (Fuß bei z=0, Kopf bei -ramp_length). +func _ready() -> void: + super() + var slope := atan2(ramp_height, ramp_length) + var surface_length := sqrt(ramp_height * ramp_height + ramp_length * ramp_length) + _ramp = build_box(self, Vector3(1.8, 0.3, surface_length + 0.6), Vector3(0, ramp_height / 2.0, -ramp_length / 2.0), Color(0.6, 0.45, 0.3)) + _ramp.rotation.x = -slope + + +## Drückt langsame Spieler die Rampe hinunter; Sprint-Momentum hält an. +func _physics_process(_delta: float) -> void: + var player := get_player() + if player == null: + return + var is_on_ramp := _is_player_on_ramp(player) + if is_on_ramp and is_player_free(player): + var speed := Vector3(player.velocity.x, 0, player.velocity.z).length() + if speed < ramp_min_momentum: + player.external_push = Vector3(0, 0, slide_back_push) + else: + player.external_push = Vector3.ZERO + _was_on_ramp = true + elif _was_on_ramp: + player.external_push = Vector3.ZERO + _was_on_ramp = false + + +## Prüft, ob der Spieler auf der Rampenfläche steht. +func _is_player_on_ramp(player: CharacterBody3D) -> bool: + var local := to_local(player.global_position) + if absf(local.x) > 1.0 or local.z > 0.3 or local.z < -ramp_length - 0.3: + return false + var expected_y := ramp_height * clampf(-local.z / ramp_length, 0.0, 1.0) + return local.y > expected_y - 0.4 and local.y < expected_y + 1.4 diff --git a/scripts/gameplay/obstacles/vertical_ramp.gd.uid b/scripts/gameplay/obstacles/vertical_ramp.gd.uid new file mode 100644 index 0000000..877a4d7 --- /dev/null +++ b/scripts/gameplay/obstacles/vertical_ramp.gd.uid @@ -0,0 +1 @@ +uid://cga1pwncectjm diff --git a/scripts/gameplay/player.gd b/scripts/gameplay/player.gd index 7b553d5..478bc89 100644 --- a/scripts/gameplay/player.gd +++ b/scripts/gameplay/player.gd @@ -190,6 +190,13 @@ func get_camera_zoom() -> float: return _spring_arm.spring_length +## Liefert den aktuellen Kamera-Pitch in Radiant (negativ = Blick nach +## unten); das Nerven-System des Gauntlet liest daran den bewussten Blick +## in die Tiefe ab. +func get_camera_pitch() -> float: + return _spring_arm.rotation.x + + ## Liefert den Namen des aktiven Bewegungszustands für Debug-Zwecke. func get_movement_state_name() -> String: return MovementState.keys()[_state] diff --git a/scripts/gameplay/rival_climbers.gd b/scripts/gameplay/rival_climbers.gd new file mode 100644 index 0000000..88190b9 --- /dev/null +++ b/scripts/gameplay/rival_climbers.gd @@ -0,0 +1,151 @@ +extends Node3D +## Rival-Kadetten des Ernstlaufs (CR-002 §7) — rein ambient. +## +## Nur im exam-Modus: rival_count Kadetten-Silhouetten klettern auf +## versetzten Linien (rival_line_offsets) die Kurs-Linie hinauf, ohne +## Kollision mit Tyrveil. Sichtbare Tode: Der Zeitplan +## rival_fall_schedule lässt Kadetten nacheinander abstürzen (Fall-Tween +## in den Nebel + Verschwinden); als Kanon-Anker stirbt der erste Kadett, +## der die Rolling-Logs-Zone erreicht, dort IMMER (Quetschung). Im +## manipulated-Preset läuft der Zeitplan gerafft. Jeder Sturz speist über +## rival_fell das Nerven-System. + +signal rival_fell(rival_id: int, ascent_index: int) + +@export var rival_count := 5 +@export var rival_climb_speed := 1.6 +@export var rival_fall_schedule: PackedFloat32Array = PackedFloat32Array([18.0, 42.0]) +@export var rival_line_offsets: PackedFloat32Array = PackedFloat32Array([-2.6, -1.8, 1.8, 2.6, -3.2]) + +var _spine: Array[Vector3] = [] +var _ascent_breaks: PackedFloat32Array = PackedFloat32Array() +var _crush_zone := Vector2.ZERO +var _rivals: Array[Node3D] = [] +var _distances: Array[float] = [] +var _is_active := false +var _elapsed := 0.0 +var _next_fall := 0 +var _has_crush_death := false +var _spine_length := 0.0 + + +## Verknüpft Kurs-Linie, Ascent-Grenzen (z-Werte) und die +## Rolling-Logs-Zone (z-Bereich) und spawnt die Kadetten. +func setup(spine: Array[Vector3], ascent_breaks: PackedFloat32Array, crush_zone: Vector2, haste_scale: float) -> void: + _spine = spine + _ascent_breaks = ascent_breaks + _crush_zone = crush_zone + for i in _spine.size() - 1: + _spine_length += _spine[i].distance_to(_spine[i + 1]) + for i in rival_count: + var rival := _make_rival(i) + add_child(rival) + _rivals.append(rival) + _distances.append(-2.5 * float(i)) + if haste_scale != 1.0: + for i in rival_fall_schedule.size(): + rival_fall_schedule[i] *= haste_scale + + +## Startet die Kletterei (Beginn des Ernstlaufs). +func start() -> void: + _is_active = true + _elapsed = 0.0 + + +## Stoppt die Kletterei (nach dem Wendepunkt: Training ohne Rivalen). +func stop() -> void: + _is_active = false + for rival in _rivals: + rival.visible = false + + +## Anzahl noch kletternder Kadetten (für Tests/Overlay). +func alive_count() -> int: + var count := 0 + for rival in _rivals: + if rival.visible: + count += 1 + return count + + +## Bewegt die Kadetten die Linie hinauf und arbeitet den Sturz-Zeitplan +## sowie den Kanon-Tod an den Rolling Logs ab. +func _physics_process(delta: float) -> void: + if not _is_active or DialogueSystem.is_dialogue_active: + return + _elapsed += delta + for i in _rivals.size(): + var rival := _rivals[i] + if not rival.visible: + continue + _distances[i] += rival_climb_speed * delta + var travelled: float = clampf(_distances[i], 0.0, _spine_length) + var point := _sample_spine(travelled) + point.x += rival_line_offsets[i % rival_line_offsets.size()] + rival.global_position = point + if not _has_crush_death and point.z <= _crush_zone.y and point.z >= _crush_zone.x: + _has_crush_death = true + _kill_rival(i) + continue + if _distances[i] >= _spine_length: + rival.visible = false + if _next_fall < rival_fall_schedule.size() and _elapsed >= rival_fall_schedule[_next_fall]: + _kill_scheduled() + + +## Lässt den nächsten planmäßigen Kadetten stürzen (sofern noch einer +## klettert). +func _kill_scheduled() -> void: + _next_fall += 1 + for i in _rivals.size(): + if _rivals[i].visible: + _kill_rival(i) + return + + +## Spielt den Sturz eines Kadetten: Fall-Tween in den Nebel, verschwinden, +## Signal an das Nerven-System. +func _kill_rival(index: int) -> void: + var rival := _rivals[index] + var ascent := _ascent_at(rival.global_position.z) + var tween := create_tween() + tween.tween_property(rival, "global_position:y", rival.global_position.y - 30.0, 1.2) + tween.tween_callback(func() -> void: rival.visible = false) + rival_fell.emit(index, ascent) + + +## Ordnet eine z-Position dem Ascent-Index 1..5 zu. +func _ascent_at(z: float) -> int: + for i in _ascent_breaks.size(): + if z > _ascent_breaks[i]: + return i + 1 + return _ascent_breaks.size() + 1 + + +## Interpoliert einen Punkt in gegebener Distanz entlang der Kurs-Linie. +func _sample_spine(travelled: float) -> Vector3: + var remaining := travelled + for i in _spine.size() - 1: + var segment := _spine[i].distance_to(_spine[i + 1]) + if remaining <= segment: + return _spine[i].lerp(_spine[i + 1], remaining / maxf(segment, 0.01)) + remaining -= segment + return _spine[_spine.size() - 1] + + +## Baut die Kadetten-Silhouette (dunkle Kapsel, keine Kollision). +func _make_rival(index: int) -> Node3D: + var rival := Node3D.new() + rival.name = "Rival%d" % (index + 1) + var mesh_instance := MeshInstance3D.new() + var capsule := CapsuleMesh.new() + capsule.radius = 0.35 + capsule.height = 1.7 + var material := StandardMaterial3D.new() + material.albedo_color = Color(0.28, 0.28, 0.34) + capsule.material = material + mesh_instance.mesh = capsule + mesh_instance.position.y = 0.85 + rival.add_child(mesh_instance) + return rival diff --git a/scripts/gameplay/rival_climbers.gd.uid b/scripts/gameplay/rival_climbers.gd.uid new file mode 100644 index 0000000..9827cf9 --- /dev/null +++ b/scripts/gameplay/rival_climbers.gd.uid @@ -0,0 +1 @@ +uid://ysdjhvye14hn diff --git a/scripts/gameplay/run_timer.gd b/scripts/gameplay/run_timer.gd new file mode 100644 index 0000000..3355abf --- /dev/null +++ b/scripts/gameplay/run_timer.gd @@ -0,0 +1,92 @@ +extends Node +## Zeitlauf des Presentation Day (CR-002 §6b). +## +## Läuft nur im Ernstlauf: startet beim Einstieg in den ersten Ascent, +## Seilberührungen addieren die Zeitstrafe (rope_time_penalty), oben am +## Box-Canyon-Eingang stoppt der Lauf und run_finished liefert die +## Gesamtzeit. Während Dialogen pausiert die Uhr. Die Anzeige ist ein +## schlichtes Label oben rechts; Platzierung/Bestenzeit ist bewusst aus +## (design-optional laut CR). + +signal run_finished(total_time: float) + +var is_running := false +var elapsed := 0.0 +var penalty_total := 0.0 + +var _label: Label + + +## Baut die HUD-Anzeige (versteckt bis zum Start). +func _ready() -> void: + var layer := CanvasLayer.new() + layer.layer = 3 + var root := Control.new() + root.set_anchors_preset(Control.PRESET_FULL_RECT) + root.mouse_filter = Control.MOUSE_FILTER_IGNORE + _label = Label.new() + _label.set_anchors_preset(Control.PRESET_TOP_RIGHT) + _label.position += Vector2(-30, 16) + _label.add_theme_font_size_override("font_size", 26) + _label.add_theme_color_override("font_outline_color", Color.BLACK) + _label.add_theme_constant_override("outline_size", 8) + _label.visible = false + root.add_child(_label) + layer.add_child(root) + add_child(layer) + + +## Zählt die Laufzeit hoch, solange der Lauf aktiv ist und kein Dialog +## läuft. +func _process(delta: float) -> void: + if not is_running or DialogueSystem.is_dialogue_active: + return + elapsed += delta + _update_label() + + +## Startet den Zeitlauf (einmalig beim Einstieg in Ascent 1). +func start_run() -> void: + if is_running: + return + is_running = true + elapsed = 0.0 + penalty_total = 0.0 + _label.visible = true + _update_label() + + +## Stoppt den Lauf und meldet die Gesamtzeit inklusive Strafen. +func stop_run() -> void: + if not is_running: + return + is_running = false + run_finished.emit(total_time()) + + +## Addiert eine Zeitstrafe (Seilberührung). +func add_penalty(seconds: float) -> void: + penalty_total += seconds + _update_label() + + +## Setzt den Lauf zurück (Tod im Ernstlauf = neuer Versuch am Fuß). +func reset() -> void: + is_running = false + elapsed = 0.0 + penalty_total = 0.0 + _label.visible = false + + +## Gesamtzeit inklusive Strafen. +func total_time() -> float: + return elapsed + penalty_total + + +## Formatiert die Anzeige (mm:ss + Strafen). +func _update_label() -> void: + var total := int(total_time()) + var text := "Zeit %02d:%02d" % [total / 60, total % 60] + if penalty_total > 0.0: + text += " (+%ds Seil)" % int(penalty_total) + _label.text = text diff --git a/scripts/gameplay/run_timer.gd.uid b/scripts/gameplay/run_timer.gd.uid new file mode 100644 index 0000000..ac09a4c --- /dev/null +++ b/scripts/gameplay/run_timer.gd.uid @@ -0,0 +1 @@ +uid://c1yqs6xmjqkdq diff --git a/scripts/gameplay/safety_rope_system.gd b/scripts/gameplay/safety_rope_system.gd new file mode 100644 index 0000000..161b18c --- /dev/null +++ b/scripts/gameplay/safety_rope_system.gd @@ -0,0 +1,198 @@ +extends Node3D +## Sicherungsseile des Gauntlet (CR-002 §6). +## +## Verteilt Seil-Punkte alle rope_spacing (~6 Fuß) entlang der Kurs-Linie +## an der Felswand. Stürzt Tyrveil (Fehlgriff-Signal eines Hindernisses, +## leerer Griff oder freier Fall), prüft das System, ob ein Seil in +## rope_catch_radius hängt und die Stelle keine No-Rope-Zone ist: Dann +## öffnet ein kurzes Greif-Fenster (rope_catch_window, Leertaste/A-Taste). +## Erfolg: Tyrveil hängt am Seil, wird auf den letzten sicheren Absatz +## darunter gesetzt und kassiert rope_time_penalty auf den Zeitlauf. +## Fehlschlag oder kein Seil: freier Fall in die KillZone (Death-State). +## Im Ernstlauf gibt es kein Abklettern an den Seilen — die Descent-Sperre +## liegt im climb_controller. + +signal rope_caught(time_penalty: float) +signal catch_failed + +@export var rope_spacing := 1.8 +@export var rope_catch_radius := 3.5 +@export var rope_catch_window := 0.7 +@export var rope_time_penalty := 30.0 + +var _player: CharacterBody3D +var _mode: Node +var _rope_points: Array[Vector3] = [] +var _anchors: Array[Vector3] = [] +var _no_rope_ranges: Array[Vector2] = [] +var _course_z := -4.0 +var _is_catching := false +var _label: Label + + +## Verknüpft Spieler und Modus, erzeugt die Seil-Punkte entlang der +## Kurs-Linie (spine) und merkt sichere Absätze sowie No-Rope-Zonen +## (z-Bereiche). +func setup(player: CharacterBody3D, gauntlet_mode: Node, spine: Array[Vector3], anchors: Array[Vector3], no_rope_ranges: Array[Vector2], course_z: float) -> void: + _player = player + _mode = gauntlet_mode + _anchors = anchors + _no_rope_ranges = no_rope_ranges + _course_z = course_z + _generate_ropes(spine) + _build_ui() + + +## Anzahl erzeugter Seil-Punkte (für Tests/Overlay). +func rope_count() -> int: + return _rope_points.size() + + +## Prüft, ob eine z-Position in einer No-Rope-Zone liegt. +func is_in_no_rope(z: float) -> bool: + for zone in _no_rope_ranges: + if z >= zone.x and z <= zone.y: + return true + return false + + +## Passive Sturz-Erkennung: freier Fall im Parcours startet den +## Seilfang-Versuch. +func _physics_process(_delta: float) -> void: + if _player == null or _is_catching or DialogueSystem.is_dialogue_active: + return + if _player.is_control_locked(): + return + if _player.global_position.z > _course_z: + return + if _player.velocity.y < -6.0: + attempt_catch() + + +## Meldet, ob gerade ein Greif-Fenster läuft (für Tests). +func is_catching() -> bool: + return _is_catching + + +## Startet den Seilfang-Versuch: Seil in Reichweite und erlaubt -> QTE, +## sonst sofort catch_failed (kein Seilfang möglich -> Death-State). +func attempt_catch() -> void: + if _is_catching: + return + var rope := _nearest_rope(_player.global_position) + if rope == Vector3.INF or is_in_no_rope(_player.global_position.z): + catch_failed.emit() + return + _is_catching = true + _run_catch_qte(rope) + + +## Spielt das Greif-Fenster als Coroutine: Spieler friert kurz ein, +## Leertaste/A greift das Seil. Der erste Physik-Frame wird übersprungen, +## damit der Tastendruck, der den Sturz auslöste (z. B. vertimter +## Rad-Absprung), nicht sofort als Seilgriff zählt. +func _run_catch_qte(rope: Vector3) -> void: + var frozen := _player.global_position + _player.set_control_locked(true) + _label.text = "SEIL GREIFEN! — Leertaste / A-Taste" + _label.visible = true + await get_tree().physics_frame + var window := rope_catch_window + if _mode != null: + window *= _mode.window_scale() + var start := Time.get_ticks_msec() + var is_caught := false + while float(Time.get_ticks_msec() - start) / 1000.0 < window: + _player.velocity = Vector3.ZERO + _player.global_position = frozen + if Input.is_action_just_pressed("grab_rope"): + is_caught = true + break + await get_tree().physics_frame + _label.visible = false + _player.set_control_locked(false) + _is_catching = false + if is_caught: + _land_at_anchor(rope) + rope_caught.emit(rope_time_penalty) + else: + _player.velocity = Vector3(0, -6, 0) + catch_failed.emit() + + +## Setzt Tyrveil nach dem Seilfang auf den nächsten sicheren Absatz +## unterhalb des Seils (sie hangelt zurück auf die Route). +func _land_at_anchor(rope: Vector3) -> void: + var best := _anchors[0] + var best_distance := INF + for anchor in _anchors: + if anchor.y > rope.y + 1.0: + continue + var distance := anchor.distance_to(rope) + if distance < best_distance: + best_distance = distance + best = anchor + _player.global_position = best + Vector3(0, 0.2, 0) + _player.velocity = Vector3.ZERO + + +## Sucht den nächsten Seil-Punkt im Fang-Radius (Vector3.INF = keiner). +func _nearest_rope(from_position: Vector3) -> Vector3: + var best := Vector3.INF + var best_distance := rope_catch_radius + for rope in _rope_points: + var distance := from_position.distance_to(rope) + if distance < best_distance: + best_distance = distance + best = rope + return best + + +## Erzeugt die Seil-Punkte entlang der Kurs-Linie (alle rope_spacing), +## überspringt No-Rope-Zonen und hängt kleine Visuals an die Wandseite. +func _generate_ropes(spine: Array[Vector3]) -> void: + for i in spine.size() - 1: + var from := spine[i] + var to := spine[i + 1] + var length := from.distance_to(to) + var steps := int(length / rope_spacing) + for step in steps: + var point := from.lerp(to, float(step) / float(maxi(steps, 1))) + if is_in_no_rope(point.z): + continue + point.x += 1.5 + _rope_points.append(point) + add_child(_make_rope_visual(point)) + + +## Baut das kleine Seil-Visual (heller Strang an der Wand). +func _make_rope_visual(point: Vector3) -> MeshInstance3D: + var mesh_instance := MeshInstance3D.new() + var mesh := BoxMesh.new() + mesh.size = Vector3(0.08, 1.2, 0.08) + var material := StandardMaterial3D.new() + material.albedo_color = Color(0.85, 0.8, 0.6) + mesh.material = material + mesh_instance.mesh = mesh + mesh_instance.position = point + return mesh_instance + + +## Baut den Greif-Prompt (zentriert, versteckt). +func _build_ui() -> void: + var layer := CanvasLayer.new() + layer.layer = 3 + var root := Control.new() + root.set_anchors_preset(Control.PRESET_FULL_RECT) + root.mouse_filter = Control.MOUSE_FILTER_IGNORE + _label = Label.new() + _label.set_anchors_preset(Control.PRESET_CENTER) + _label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER + _label.add_theme_font_size_override("font_size", 40) + _label.add_theme_color_override("font_color", Color(0.95, 0.9, 0.5)) + _label.add_theme_color_override("font_outline_color", Color.BLACK) + _label.add_theme_constant_override("outline_size", 8) + _label.visible = false + root.add_child(_label) + layer.add_child(root) + add_child(layer) diff --git a/scripts/gameplay/safety_rope_system.gd.uid b/scripts/gameplay/safety_rope_system.gd.uid new file mode 100644 index 0000000..a10a1bc --- /dev/null +++ b/scripts/gameplay/safety_rope_system.gd.uid @@ -0,0 +1 @@ +uid://dx3y6bjs2mpjo