From bc410156eec402129629b0344b63abf6dcbb3de1 Mon Sep 17 00:00:00 2001 From: danny Date: Sat, 11 Jul 2026 14:53:26 +0200 Subject: [PATCH] V.0.6.1 --- 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 | 9 +- data/gauntlet/terrace_1.tres | 19 ++ data/gauntlet/terrace_2.tres | 13 + data/gauntlet/terrace_3.tres | 14 + data/gauntlet/terrace_4.tres | 13 + data/gauntlet/terrace_5.tres | 14 + docs/CHANGEREQUESTS.md | 6 + docs/CHANGEREQUESTS_DONE.md | 63 ++++ docs/CHARACTERS.md | 22 ++ 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/gauntlet.tscn | 105 ++++--- scenes/gauntlet/terrace_1.tscn | 55 ++++ scenes/gauntlet/terrace_2.tscn | 46 +++ scenes/gauntlet/terrace_3.tscn | 43 +++ scenes/gauntlet/terrace_4.tscn | 51 ++++ .../{ascent_5.tscn => terrace_5.tscn} | 19 +- scripts/gameplay/climb_controller.gd | 8 +- scripts/gameplay/dragon_distraction.gd | 8 +- scripts/gameplay/gauntlet.gd | 281 +++++++++--------- scripts/gameplay/gauntlet_tuning.gd | 22 +- scripts/gameplay/nerve_system.gd | 10 +- scripts/gameplay/obstacles/buoy_ball.gd | 6 +- scripts/gameplay/obstacles/rolling_log.gd | 2 +- scripts/gameplay/obstacles/shaking_pillar.gd | 2 +- scripts/gameplay/obstacles/spinning_log.gd | 2 +- scripts/gameplay/obstacles/spinning_wheel.gd | 242 ++++++++++----- scripts/gameplay/obstacles/vertical_ramp.gd | 2 +- scripts/gameplay/rival_climbers.gd | 68 +++-- scripts/gameplay/safety_rope_field.gd | 226 ++++++++++++++ ...system.gd.uid => safety_rope_field.gd.uid} | 0 scripts/gameplay/safety_rope_system.gd | 198 ------------ .../{ascent_config.gd => terrace_config.gd} | 25 +- ...nt_config.gd.uid => terrace_config.gd.uid} | 0 41 files changed, 1058 insertions(+), 743 deletions(-) delete mode 100644 data/gauntlet/ascent_1.tres delete mode 100644 data/gauntlet/ascent_2.tres delete mode 100644 data/gauntlet/ascent_3.tres delete mode 100644 data/gauntlet/ascent_4.tres delete mode 100644 data/gauntlet/ascent_5.tres create mode 100644 data/gauntlet/terrace_1.tres create mode 100644 data/gauntlet/terrace_2.tres create mode 100644 data/gauntlet/terrace_3.tres create mode 100644 data/gauntlet/terrace_4.tres create mode 100644 data/gauntlet/terrace_5.tres delete mode 100644 scenes/gauntlet/ascent_1.tscn delete mode 100644 scenes/gauntlet/ascent_2.tscn delete mode 100644 scenes/gauntlet/ascent_3.tscn delete mode 100644 scenes/gauntlet/ascent_4.tscn create mode 100644 scenes/gauntlet/terrace_1.tscn create mode 100644 scenes/gauntlet/terrace_2.tscn create mode 100644 scenes/gauntlet/terrace_3.tscn create mode 100644 scenes/gauntlet/terrace_4.tscn rename scenes/gauntlet/{ascent_5.tscn => terrace_5.tscn} (66%) create mode 100644 scripts/gameplay/safety_rope_field.gd rename scripts/gameplay/{safety_rope_system.gd.uid => safety_rope_field.gd.uid} (100%) delete mode 100644 scripts/gameplay/safety_rope_system.gd rename scripts/gameplay/{ascent_config.gd => terrace_config.gd} (62%) rename scripts/gameplay/{ascent_config.gd.uid => terrace_config.gd.uid} (100%) diff --git a/data/gauntlet/ascent_1.tres b/data/gauntlet/ascent_1.tres deleted file mode 100644 index 3f86297..0000000 --- a/data/gauntlet/ascent_1.tres +++ /dev/null @@ -1,14 +0,0 @@ -[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 deleted file mode 100644 index 6965951..0000000 --- a/data/gauntlet/ascent_2.tres +++ /dev/null @@ -1,13 +0,0 @@ -[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 deleted file mode 100644 index f22fa72..0000000 --- a/data/gauntlet/ascent_3.tres +++ /dev/null @@ -1,14 +0,0 @@ -[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 deleted file mode 100644 index 0f3b429..0000000 --- a/data/gauntlet/ascent_4.tres +++ /dev/null @@ -1,13 +0,0 @@ -[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 deleted file mode 100644 index df68c41..0000000 --- a/data/gauntlet/ascent_5.tres +++ /dev/null @@ -1,14 +0,0 @@ -[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 index 2e39b6d..9353ced 100644 --- a/data/gauntlet/gauntlet_tuning.tres +++ b/data/gauntlet/gauntlet_tuning.tres @@ -5,9 +5,14 @@ [resource] script = ExtResource("1_tuning") rope_spacing = 1.8 -rope_catch_radius = 3.5 rope_catch_window = 0.7 +rope_recover_time = 1.2 rope_time_penalty = 30.0 +corridor_width = 3.0 +terrace_height_offset = 6.0 +terrace_width = 2.4 +curve_length = 4.0 +curve_width = 0.9 grip_max = 100.0 grip_drain_rate = 3.5 grip_regen_rate = 30.0 @@ -23,7 +28,7 @@ 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) +rival_line_offsets = PackedFloat32Array(-0.7, -0.35, 0.35, 0.7, -1.0) distraction_enabled_baseline = false distraction_interval_min = 6.0 distraction_interval_max = 12.0 diff --git a/data/gauntlet/terrace_1.tres b/data/gauntlet/terrace_1.tres new file mode 100644 index 0000000..29421e3 --- /dev/null +++ b/data/gauntlet/terrace_1.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="TerraceConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/terrace_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +terrace_index = 1 +focus = "Einstieg (links -> rechts): Spinning Log, Granite Pillars, Trommel-Rad" +log_spin_speed = 2.0 +pillar_gap = 1.1 +pillar_count = 4 +wheel_diameter = 4.0 +wheel_speed = 0.8 +wheel_dir = 1 +wheel_gap_arc = 1.0 +wheel_entry_window = 0.6 +gap_jump_window = 0.6 +wheel_exit_window = 0.5 +wheel_carry_force = 0.35 diff --git a/data/gauntlet/terrace_2.tres b/data/gauntlet/terrace_2.tres new file mode 100644 index 0000000..68441eb --- /dev/null +++ b/data/gauntlet/terrace_2.tres @@ -0,0 +1,13 @@ +[gd_resource type="Resource" script_class="TerraceConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/terrace_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +terrace_index = 2 +focus = "Bojen-Kugeln (rechts -> links): momentum_swing an der Querschiene" +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/terrace_3.tres b/data/gauntlet/terrace_3.tres new file mode 100644 index 0000000..b2e1fcd --- /dev/null +++ b/data/gauntlet/terrace_3.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="TerraceConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/terrace_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +terrace_index = 3 +focus = "Eisen (links -> rechts): 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/terrace_4.tres b/data/gauntlet/terrace_4.tres new file mode 100644 index 0000000..b9f1605 --- /dev/null +++ b/data/gauntlet/terrace_4.tres @@ -0,0 +1,13 @@ +[gd_resource type="Resource" script_class="TerraceConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/terrace_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +terrace_index = 4 +focus = "Rollende Staemme (rechts -> links, diagonal): Tempo-Pflicht, No-Rope" +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/terrace_5.tres b/data/gauntlet/terrace_5.tres new file mode 100644 index 0000000..845ed60 --- /dev/null +++ b/data/gauntlet/terrace_5.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="TerraceConfig" load_steps=2 format=3] + +[ext_resource type="Script" path="res://scripts/gameplay/terrace_config.gd" id="1_config"] + +[resource] +script = ExtResource("1_config") +terrace_index = 5 +focus = "Finale: Felsspalt-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/docs/CHANGEREQUESTS.md b/docs/CHANGEREQUESTS.md index e4a0650..7ea636d 100644 --- a/docs/CHANGEREQUESTS.md +++ b/docs/CHANGEREQUESTS.md @@ -3,3 +3,9 @@ > Hier schreibe ich Änderungen auf die mir während dem Test auffällt. Bitte arbeite die bei jeder Phase vorher ab sodass hier alles erledifgt ist > Erledigte Punkte Löscht du bitte sodass diese nicht ausversehen doppelt gemacht werden. Die Erledigten Punkte sollen dann Bitte in die Datei CHANGEREQUESTS_DONE rein mit einer Anmerkung von dir wann geändert und was du getan hast. + +- Das Rad beim Gauntlet muss liegen und nicht aufrecht stehen +- Ich kann mich nicht an den Kugeln Festhalten +- Die Steuerung allgemein ist nicht flüssig. Alles ist so abgehakt und man kommt viel zu simpel an die Seile, teilweise blockieren die einen weil man mit dem Rad bsp interagieren will aber man kommt ausversehen an die Seile +- Am Rad soll man nicht Leertaste drücken müssen um da rein zu kommen, sondern man soll reinlaufen können, dh es braucht eine Hitbox +- Die Tasten die Man drücken muss sind teilweise VIEL zu schwer zu erkennen. Mach da einfach ein Tastensymbol an die Objekte mit denen man Interagiren kann. wenn Tastatur dann ein Tastenzeichen mit der Taste drauf bsp (E) und wenn man Controller spielt eine Controller Taste mti dem Button (B,X,Viereck etc.) \ No newline at end of file diff --git a/docs/CHANGEREQUESTS_DONE.md b/docs/CHANGEREQUESTS_DONE.md index 825dc79..6a61e4f 100644 --- a/docs/CHANGEREQUESTS_DONE.md +++ b/docs/CHANGEREQUESTS_DONE.md @@ -3,6 +3,69 @@ > Abgearbeitete Change Requests aus CHANGEREQUESTS.md, mit Datum und > Anmerkung, was geändert wurde. +## 2026-07-11 — CR-003: Gauntlet Rework — Serpentine über fünf Terrassen + +**Request:** CR-002 bildete den Gauntlet falsch ab (gestapelte +Kletter-Ascents, Seile an der Wand, Rad zum Drüberlaufen). Tatsächlich: +Serpentine über fünf Terrassen im Zickzack, Lauf-/Balance-/Hangel- +Hindernisse (Klettern nur im Finale), Rad als geschlossene Trommel mit +einer Lücke (man läuft innen), Seilfeld frei im Sturzkorridor, Kurven +als echte Laufwege, Kamin als natürlicher Felsspalt. + +**Umsetzung:** +- **Level:** `terrace_1.tscn`–`terrace_5.tscn` (umbenannt aus ascent_*), + vertikal versetzt in die Felswand, Laufrichtung wechselt pro Terrasse + (T1/T3/T5 links→rechts, T2/T4 rechts→links, T4 diagonal aufsteigend + über die Stämme). Verbunden durch vier `gravel_curve`-Kehren: + schulterbreite Rampen, die über den Abgrund hinausschwingen — echte + Laufwege mit Zeitanteil, Rast-Zone, Checkpoint (Training) und Blick + auf stürzende Rivalen. Kein Geländer; offene Außenseite = Absturzkante + in den Sturzkorridor. Drachen + Box-Canyon-Engpass oben, Viadukt-Nebel. +- **Terrassen-Inhalte:** T1 Spinning Log → 4 Granite Pillars + (rüberspringen, flach) → Trommel-Rad. T2 fünf Buoy Balls an einer + Querschiene (momentum_swing). T3 drei Iron Rails (A/D- bzw. + LB/RB-Hangeln, Höhenversatz) → 4 Shaking Pillars. T4 sieben Rolling + Logs als Treppe (alternierende Rollrichtung, Tempo-Pflicht, + Quetsch-Tod, No-Rope). T5 Felsspalt-Kamin (X-Spreiz, kein + Behelfs-Seil) → Vertical Ramp → Cliff Ledge (einziger Kletter-Einsatz) + → Box-Canyon. Terrasse 1–4 kommen ohne Klettern aus. +- **Trommel-Rad neu** (`spinning_wheel`): geschlossene Haut mit genau + einer Lücke (`wheel_gap_arc`), Radebene parallel zur Wand. Einstieg + seitlich durch die Lücke im Fenster (`wheel_entry_window`; vertimter + Einsprung prallt ab), innen Mitlaufen gegen `wheel_carry_force` (A/D), + die durchziehende Lücke muss übersprungen werden (`gap_jump_window`, + sonst Durchfallen), Ausstieg gegenüber im `wheel_exit_window`. Zwei + Dummy-Kadetten als Timing-Referenz. Signale wheel_entered/ + wheel_gap_cleared/wheel_exited. +- **Seilfeld neu** (`safety_rope_field`, ersetzt safety_rope_system): + Seile hängen frei im Sturzkorridor VOR den Terrassen (volle Wandhöhe, + alle ~6 Fuß). Fang ist ein Fall-Feature: Greif-Fenster im freien + Sturz, Erfolg = Hang-Phase (`rope_recover_time`) + zurück auf den + letzten Absatz, Fehlschlag = rope_missed -> Death-State. JEDE + Seilberührung (auch Streifen im Lauf) kostet 30 s. No-Rope über das + Absturz-Ursprungs-Höhenband der Rolling-Logs-Terrasse (Sturz geht dort + den Hang hinab, nie ins Feld). Signale rope_touched(time_penalty)/ + rope_caught/rope_missed. +- **Systeme angepasst:** run_timer zählt die Kurven mit; rival_climbers + laufen die Serpentine auf quer versetzten Linien (Kanon-Crush im + Rolling-Logs-Höhenband); nerve_system/climb_controller/ + dragon_distraction auf die neue Kurs-Erkennung (x/Höhe statt + z-Achse) umgestellt; Hindernis-Schübe folgen jetzt der lokalen + Ausrichtung (Terrassen sind rotiert). Descent-Sperre im Ernstlauf + bleibt. Signale umbenannt: ascent_completed -> terrace_completed, + story_hook_reached(terrace_index) am Terrassen-Übergang. +- **Story unangetastet:** Auftakt am Fuß, Maren-Intervention am Anfang + von Terrasse 5, Sterbeszene, Wahrheiten, Trauer-Wahl, Beat-Kette; + erster Besuch = manipulierter Ernstlauf, danach freies Training. +- **Daten:** `data/gauntlet/terrace_1..5.tres` (TerraceConfig, umbenannt) + + `gauntlet_tuning.tres` um Seilfeld-/Kurven-/Korridor-Werte erweitert + (rope_recover_time, corridor_width, terrace_height_offset, + terrace_width, curve_length, curve_width). Geometrie-Werte stehen als + Szenen-Overrides, Verhaltens-Werte werden beim Start verteilt. + +**Verifikation:** Headless-Sonde (73 Checks) mit Watchdog gegen Hänger. +Details siehe Commit; Ergebnis des finalen Laufs in der Commit-Message. + ## 2026-07-09 — CR-002: Gauntlet als Kletter-Hindernisparcours (5 Ascents) **Request:** Gauntlet buchgetreu als vertikalen Kletter-Parcours an der diff --git a/docs/CHARACTERS.md b/docs/CHARACTERS.md index efa53c2..cd0addb 100644 --- a/docs/CHARACTERS.md +++ b/docs/CHARACTERS.md @@ -66,3 +66,25 @@ Menschlich, nicht heilig: sie hat Angst, macht Witze, und geht trotzdem. - **Sawyer / Ridoc** — Squad-Kameraden; Ridoc bringt Humor, Sawyer Bodenhaftung. - **Lehrer** — Kampf, Landnavigation, Geschichte/RSC, Drachenkunde. Einer von ihnen ist verwickelt in die Aussonderung (Haken, in v1 nur angedeutet). + +## Aufteilung der Charaktere nach Jahrgängen und Lehrern + +### 1. Lehrjahr (Erstjahre) +* **Tyrveil Rowyth** (Protagonist, Gezeichneter) +* **Liam Mairi** (Gezeichneter) +* **Wren Calloran** (Gezeichneter / Originalfigur) +* **Violet Sorrengail** (Keine Gezeichnete / Verbündete) +* **Rhiannon** +* **Dain Aetos** +* **Ridoc** +* **Sawyer** + +### 2. Lehrjahr (Zweitjahre) +* **Imogen Cardulo** (Gezeichnete) + +### 3. Lehrjahr (Drittjahre) +* **Xaden Riorson** (Gezeichneter / Anführer) +* **Maren Vael** (Gezeichnete / Originalfigur) + +### Lehrkräfte +* **Die Ausbilder** (Kampf, Landnavigation, Geschichte/RSC, Drachenkunde) \ No newline at end of file diff --git a/scenes/gauntlet/ascent_1.tscn b/scenes/gauntlet/ascent_1.tscn deleted file mode 100644 index 084965b..0000000 --- a/scenes/gauntlet/ascent_1.tscn +++ /dev/null @@ -1,36 +0,0 @@ -[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 deleted file mode 100644 index d80b517..0000000 --- a/scenes/gauntlet/ascent_2.tscn +++ /dev/null @@ -1,30 +0,0 @@ -[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 deleted file mode 100644 index c1f2e77..0000000 --- a/scenes/gauntlet/ascent_3.tscn +++ /dev/null @@ -1,33 +0,0 @@ -[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 deleted file mode 100644 index 2e5c86b..0000000 --- a/scenes/gauntlet/ascent_4.tscn +++ /dev/null @@ -1,40 +0,0 @@ -[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/gauntlet.tscn b/scenes/gauntlet/gauntlet.tscn index 3857a58..973354c 100644 --- a/scenes/gauntlet/gauntlet.tscn +++ b/scenes/gauntlet/gauntlet.tscn @@ -5,18 +5,19 @@ [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"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/terrace_1.tscn" id="6_terrace1"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/terrace_2.tscn" id="7_terrace2"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/terrace_3.tscn" id="8_terrace3"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/terrace_4.tscn" id="9_terrace4"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/terrace_5.tscn" id="10_terrace5"] +[ext_resource type="Script" path="res://scripts/gameplay/gravel_curve.gd" id="11_curve"] +[ext_resource type="Script" path="res://scripts/gameplay/gauntlet_mode.gd" id="12_mode"] +[ext_resource type="Script" path="res://scripts/gameplay/climb_controller.gd" id="13_climb"] +[ext_resource type="Script" path="res://scripts/gameplay/nerve_system.gd" id="14_nerve"] +[ext_resource type="Script" path="res://scripts/gameplay/safety_rope_field.gd" id="15_ropes"] +[ext_resource type="Script" path="res://scripts/gameplay/run_timer.gd" id="16_timer"] +[ext_resource type="Script" path="res://scripts/gameplay/rival_climbers.gd" id="17_rivals"] +[ext_resource type="Script" path="res://scripts/gameplay/dragon_distraction.gd" id="18_distraction"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.62, 0.63, 0.66, 1) @@ -65,10 +66,10 @@ material = SubResource("StandardMaterial3D_stone") size = Vector3(2, 0.5, 2.5) [sub_resource type="BoxShape3D" id="BoxShape3D_intervention"] -size = Vector3(3, 2, 4.5) +size = Vector3(4, 2.5, 3) [sub_resource type="BoxShape3D" id="BoxShape3D_killzone"] -size = Vector3(60, 6, 140) +size = Vector3(70, 6, 40) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_trigger"] transparency = 1 @@ -91,23 +92,47 @@ 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="Ascent1" parent="." instance=ExtResource("6_ascent1")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -6) +[node name="Terrace1" parent="." instance=ExtResource("6_terrace1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.6) -[node name="Ascent2" parent="." instance=ExtResource("7_ascent2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 8, -30) +[node name="Terrace2" parent="." instance=ExtResource("7_terrace2")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, -0.6) -[node name="Ascent3" parent="." instance=ExtResource("8_ascent3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 14, -48) +[node name="Terrace3" parent="." instance=ExtResource("8_terrace3")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 12, -0.6) -[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="Terrace4" parent="." instance=ExtResource("9_terrace4")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 18, -0.6) -[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="Terrace5" parent="." instance=ExtResource("10_terrace5")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 25, -0.6) + +[node name="Curve1" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.4, 0, -0.6) +script = ExtResource("11_curve") +height_gain = 6.0 +side = 1 + +[node name="Curve2" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.4, 6, -0.6) +script = ExtResource("11_curve") +height_gain = 6.0 +side = -1 + +[node name="Curve3" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.4, 12.2, -0.6) +script = ExtResource("11_curve") +height_gain = 5.8 +side = 1 + +[node name="Curve4" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.4, 21.15, -0.6) +script = ExtResource("11_curve") +height_gain = 3.85 +side = -1 [node name="Maren" type="StaticBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 0, -1) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 0, 0.4) [node name="CollisionShape3D" type="CollisionShape3D" parent="Maren"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) @@ -128,7 +153,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.8, 26.45, -89) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.5, 25, -0.1) [node name="CollisionShape3D" type="CollisionShape3D" parent="Wren"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0) @@ -151,7 +176,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8, 0) [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, 26.2, -93.5) +transform = Transform3D(0, 0.119712, 0.992809, 0, 0.992809, -0.119712, -1, 0, 0, -7.6, 25.05, -0.6) [node name="CollisionShape3D" type="CollisionShape3D" parent="CollapsingSection/TiltA"] shape = SubResource("BoxShape3D_tilt") @@ -160,7 +185,7 @@ shape = SubResource("BoxShape3D_tilt") 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.5, 26, -94.8) +transform = Transform3D(0, -0.119712, 0.992809, 0, 0.992809, 0.119712, -1, 0, 0, -6.6, 24.9, -0.2) [node name="CollisionShape3D" type="CollisionShape3D" parent="CollapsingSection/TiltB"] shape = SubResource("BoxShape3D_tilt") @@ -169,7 +194,7 @@ shape = SubResource("BoxShape3D_tilt") mesh = SubResource("BoxMesh_tilt") [node name="InterventionTrigger" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 27.3, -90) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.5, 26.4, -0.6) collision_layer = 0 collision_mask = 2 @@ -177,7 +202,7 @@ collision_mask = 2 shape = SubResource("BoxShape3D_intervention") [node name="KillZone" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, -55) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, 0) collision_layer = 0 collision_mask = 2 @@ -185,7 +210,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, 38.6, -112.5) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.5, 37.5, -0.6) collision_layer = 0 collision_mask = 2 script = ExtResource("4_zone") @@ -205,27 +230,27 @@ font_size = 40 outline_size = 12 [node name="GauntletMode" type="Node" parent="."] -script = ExtResource("11_mode") +script = ExtResource("12_mode") [node name="ClimbController" type="Node" parent="."] -script = ExtResource("12_climb") +script = ExtResource("13_climb") [node name="NerveSystem" type="Node" parent="."] -script = ExtResource("13_nerve") +script = ExtResource("14_nerve") -[node name="SafetyRopeSystem" type="Node3D" parent="."] -script = ExtResource("14_ropes") +[node name="SafetyRopeField" type="Node3D" parent="."] +script = ExtResource("15_ropes") [node name="RunTimer" type="Node" parent="."] -script = ExtResource("15_timer") +script = ExtResource("16_timer") [node name="RivalClimbers" type="Node3D" parent="."] -script = ExtResource("16_rivals") +script = ExtResource("17_rivals") [node name="DragonDistraction" type="Node" parent="."] -script = ExtResource("17_distraction") +script = ExtResource("18_distraction") [node name="Player" parent="." instance=ExtResource("2_player")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 2) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 0.1, -0.6) [node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] diff --git a/scenes/gauntlet/terrace_1.tscn b/scenes/gauntlet/terrace_1.tscn new file mode 100644 index 0000000..8527f6b --- /dev/null +++ b/scenes/gauntlet/terrace_1.tscn @@ -0,0 +1,55 @@ +[gd_scene load_steps=4 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/spinning_log.tscn" id="2_log"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/spinning_wheel.tscn" id="3_wheel"] + +[node name="Terrace1" type="Node3D"] + +[node name="ShelfA" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.75, -0.6, 0) +obstacle_id = "t1_shelf_a" +size = Vector3(4.5, 0.6, 2.4) + +[node name="SpinningLog" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, -16.4, -0.15, 0) +obstacle_id = "spinning_log" + +[node name="ShelfB" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11, -0.05, 0) +obstacle_id = "t1_shelf_b" +size = Vector3(1.6, 0.6, 2.4) + +[node name="Pillar1" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.2, -0.6, 0) +obstacle_id = "granite_pillar_1" +size = Vector3(0.9, 1.15, 0.9) + +[node name="Pillar2" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.2, -0.6, 0) +obstacle_id = "granite_pillar_2" +size = Vector3(0.9, 1.15, 0.9) + +[node name="Pillar3" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.2, -0.6, 0) +obstacle_id = "granite_pillar_3" +size = Vector3(0.9, 1.15, 0.9) + +[node name="Pillar4" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.2, -0.6, 0) +obstacle_id = "granite_pillar_4" +size = Vector3(0.9, 1.15, 0.9) + +[node name="ShelfC" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.3, -0.05, 0) +obstacle_id = "t1_shelf_c" +size = Vector3(2.8, 0.6, 2.4) + +[node name="SpinningWheel" parent="." instance=ExtResource("3_wheel")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.7, 2, 0) +obstacle_id = "spinning_wheel" + +[node name="ShelfD" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.75, -0.1, 0) +obstacle_id = "t1_shelf_d" +size = Vector3(13.5, 0.6, 2.4) diff --git a/scenes/gauntlet/terrace_2.tscn b/scenes/gauntlet/terrace_2.tscn new file mode 100644 index 0000000..2aba45c --- /dev/null +++ b/scenes/gauntlet/terrace_2.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=3 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/buoy_ball.tscn" id="2_buoy"] + +[node name="Terrace2" type="Node3D"] + +[node name="ShelfA" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.75, -0.6, 0) +obstacle_id = "t2_shelf_a" +size = Vector3(4.5, 0.6, 2.4) + +[node name="Crossbar" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.3, 3.45, 0) +obstacle_id = "t2_crossbar" +size = Vector3(13, 0.3, 0.3) + +[node name="BuoyBall1" parent="." instance=ExtResource("2_buoy")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 15.5, 2.6, 0) +obstacle_id = "buoy_1" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall2" parent="." instance=ExtResource("2_buoy")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 12.9, 2.6, 0) +obstacle_id = "buoy_2" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall3" parent="." instance=ExtResource("2_buoy")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 10.3, 2.6, 0) +obstacle_id = "buoy_3" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall4" parent="." instance=ExtResource("2_buoy")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 7.7, 2.6, 0) +obstacle_id = "buoy_4" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="BuoyBall5" parent="." instance=ExtResource("2_buoy")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 5.1, 2.6, 0) +obstacle_id = "buoy_5" +launch_target = Vector3(0, -0.6, -2.6) + +[node name="ShelfB" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.5, -0.6, 0) +obstacle_id = "t2_shelf_b" +size = Vector3(23, 0.6, 2.4) diff --git a/scenes/gauntlet/terrace_3.tscn b/scenes/gauntlet/terrace_3.tscn new file mode 100644 index 0000000..e129aea --- /dev/null +++ b/scenes/gauntlet/terrace_3.tscn @@ -0,0 +1,43 @@ +[gd_scene load_steps=4 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/iron_rail.tscn" id="2_rail"] +[ext_resource type="PackedScene" path="res://scenes/gauntlet/obstacles/shaking_pillar.tscn" id="3_shake"] + +[node name="Terrace3" type="Node3D"] + +[node name="ShelfA" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.75, -0.6, 0) +obstacle_id = "t3_shelf_a" +size = Vector3(4.5, 0.6, 2.4) + +[node name="IronRail" parent="." instance=ExtResource("2_rail")] +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, -16.2, 0, 0) +obstacle_id = "iron_rail" +drop_target = Vector3(0, 1.4, -12.8) + +[node name="RailLanding" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.4, 0.2, 0) +obstacle_id = "rail_landing" +size = Vector3(1.8, 1.2, 1.8) + +[node name="ShakingPillar1" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, -1.2, -0.8, 0) +obstacle_id = "shaking_pillar_1" + +[node name="ShakingPillar2" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, 0.8, -0.8, 0) +obstacle_id = "shaking_pillar_2" + +[node name="ShakingPillar3" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, 2.8, -1.5, 0) +obstacle_id = "shaking_pillar_3" + +[node name="ShakingPillar4" parent="." instance=ExtResource("3_shake")] +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, 4.8, -2, 0) +obstacle_id = "shaking_pillar_4" + +[node name="ShelfB" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.3, -0.4, 0) +obstacle_id = "t3_shelf_b" +size = Vector3(14.4, 0.6, 2.4) diff --git a/scenes/gauntlet/terrace_4.tscn b/scenes/gauntlet/terrace_4.tscn new file mode 100644 index 0000000..c3c16bf --- /dev/null +++ b/scenes/gauntlet/terrace_4.tscn @@ -0,0 +1,51 @@ +[gd_scene load_steps=3 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/rolling_log.tscn" id="2_log"] + +[node name="Terrace4" type="Node3D"] + +[node name="ShelfA" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.4, -0.6, 0) +obstacle_id = "t4_shelf_a" +size = Vector3(5.2, 0.6, 2.4) + +[node name="RollingLog1" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 14.4, 0.45, 0) +obstacle_id = "rolling_log_1" +roll_dir = 1 + +[node name="RollingLog2" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 12.2, 0.9, 0) +obstacle_id = "rolling_log_2" +roll_dir = -1 + +[node name="RollingLog3" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 10, 1.35, 0) +obstacle_id = "rolling_log_3" +roll_dir = 1 + +[node name="RollingLog4" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 7.8, 1.8, 0) +obstacle_id = "rolling_log_4" +roll_dir = -1 + +[node name="RollingLog5" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 5.6, 2.25, 0) +obstacle_id = "rolling_log_5" +roll_dir = 1 + +[node name="RollingLog6" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 3.4, 2.7, 0) +obstacle_id = "rolling_log_6" +roll_dir = -1 + +[node name="RollingLog7" parent="." instance=ExtResource("2_log")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 1.2, 3.15, 0) +obstacle_id = "rolling_log_7" +roll_dir = 1 + +[node name="ShelfB" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.4, 2.55, 0) +obstacle_id = "t4_shelf_b" +size = Vector3(21.4, 0.6, 2.4) diff --git a/scenes/gauntlet/ascent_5.tscn b/scenes/gauntlet/terrace_5.tscn similarity index 66% rename from scenes/gauntlet/ascent_5.tscn rename to scenes/gauntlet/terrace_5.tscn index 1aea1bf..68e6d1c 100644 --- a/scenes/gauntlet/ascent_5.tscn +++ b/scenes/gauntlet/terrace_5.tscn @@ -5,32 +5,37 @@ [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="Terrace5" type="Node3D"] + +[node name="ShelfA" parent="." instance=ExtResource("1_pillar")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.5, -0.6, 0) +obstacle_id = "t5_shelf_a" +size = Vector3(13, 0.6, 2.4) [node name="ChimneyBase" parent="." instance=ExtResource("1_pillar")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.3, -2) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, -0.3, 0) 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) +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, -5.5, 0, 0) 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) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 5.9, 0) 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) +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, -2, 6.3, 0) 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) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 8.9, 0) 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) +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, 4.4, 9.3, 0) obstacle_id = "cliff_ledge" diff --git a/scripts/gameplay/climb_controller.gd b/scripts/gameplay/climb_controller.gd index 3eaedb1..99db361 100644 --- a/scripts/gameplay/climb_controller.gd +++ b/scripts/gameplay/climb_controller.gd @@ -24,17 +24,17 @@ var grip := 100.0 var _player: CharacterBody3D var _nerve: Node var _mode: Node -var _course_z := -4.0 +var _course_min_x := -20.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: +func setup(player: CharacterBody3D, nerve_system: Node, gauntlet_mode: Node, course_min_x: float) -> void: _player = player _nerve = nerve_system _mode = gauntlet_mode - _course_z = course_z + _course_min_x = course_min_x grip = grip_max _build_hud() @@ -56,7 +56,7 @@ func reset_grip() -> void: 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 + var is_in_course: bool = _player.global_position.x > _course_min_x or _player.global_position.y > 2.0 if not is_in_course: _apply_grip(grip + grip_regen_rate * delta) return diff --git a/scripts/gameplay/dragon_distraction.gd b/scripts/gameplay/dragon_distraction.gd index 2d480a3..bf4e151 100644 --- a/scripts/gameplay/dragon_distraction.gd +++ b/scripts/gameplay/dragon_distraction.gd @@ -21,17 +21,17 @@ var _player: CharacterBody3D var _nerve: Node var _mode: Node var _dragons: Array[Node3D] = [] -var _course_z := -4.0 +var _course_min_x := -20.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: +func setup(player: CharacterBody3D, nerve_system: Node, gauntlet_mode: Node, dragons: Array[Node3D], course_min_x: float) -> void: _player = player _nerve = nerve_system _mode = gauntlet_mode _dragons = dragons - _course_z = course_z + _course_min_x = course_min_x _reset_timer() @@ -49,7 +49,7 @@ func _physics_process(delta: float) -> void: return if DialogueSystem.is_dialogue_active or _player.is_control_locked(): return - if _player.global_position.z > _course_z: + if _player.global_position.x <= _course_min_x and _player.global_position.y <= 2.0: return _timer -= delta if _timer <= 0.0: diff --git a/scripts/gameplay/gauntlet.gd b/scripts/gameplay/gauntlet.gd index f1e01cf..4d1b412 100644 --- a/scripts/gameplay/gauntlet.gd +++ b/scripts/gameplay/gauntlet.gd @@ -1,30 +1,32 @@ extends Node3D -## Ablauf-Steuerung des Gauntlet (CR-002: vertikaler Kletter-Parcours, +## Ablauf-Steuerung des Gauntlet (CR-003: Serpentine über fünf Terrassen, ## Phase 4c: Wendepunkt, STORY.md Abschnitte 3 und 5). ## -## 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). +## Der Parcours ist eine Serpentine: fünf Terrassen, vertikal versetzt in +## die Felswand geschnitten, die Laufrichtung wechselt pro Terrasse +## (Zickzack), verbunden durch schulterbreite Kies-Kurven an den +## Terrassen-Enden (echte Laufwege mit Zeitanteil, Rast und Blick auf den +## Abgrund). Terrasse 1–4 sind Lauf-, Balance- und Hangel-Hindernisse; +## geklettert wird erst im Finale (Felsspalt-Kamin, Rampe, Felskante -> +## Box-Canyon mit den Drachen). Die offene Außenseite ist Absturzkante: +## Im Sturzkorridor davor hängt das Seilfeld (safety_rope_field) — der +## Seilfang greift im freien Fall, jede Berührung kostet Zeit, an den +## Rolling Logs (Terrasse 4) gibt es keine Seile. Komponenten am Root: +## gauntlet_mode, climb_controller (Griff + Descent-Sperre im Ernstlauf), +## safety_rope_field, run_timer, rival_climbers, nerve_system, +## dragon_distraction (baseline aus, ohne Wind-Ruck/QTE). ## ## 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 +## Sequenz am Terrassen-5-Anfang: 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). +## Trauer-Wahl. Danach ist der Lauf freies Training ohne Rivalen. +## story_hook_reached feuert an jedem Terrassen-Übergang (Anker für den +## separaten Phase-4-Story-CR). -signal ascent_completed(index: int) +signal terrace_completed(index: int) signal obstacle_cleared(obstacle_id: String) -signal story_hook_reached(ascent_index: int) +signal story_hook_reached(terrace_index: int) const MAIN_MENU_SCENE := "res://scenes/ui/main_menu.tscn" const START_PATH := "res://data/dialogue/gauntlet_start.json" @@ -32,52 +34,44 @@ 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 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 TERRACE_CONFIG_PATHS: Array[String] = [ + "res://data/gauntlet/terrace_1.tres", + "res://data/gauntlet/terrace_2.tres", + "res://data/gauntlet/terrace_3.tres", + "res://data/gauntlet/terrace_4.tres", + "res://data/gauntlet/terrace_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), + "log_spin_speed", "wheel_speed", "wheel_dir", "wheel_entry_window", + "gap_jump_window", "wheel_exit_window", "wheel_carry_force", + "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(-17.5, 25.1, -0.2) +const MAREN_FALL_POSITION := Vector3(-18.3, 25.1, -0.9) +const WREN_SAFE_POSITION := Vector3(-16.5, 25.1, -0.2) +const BASE_SPAWN := Vector3(-23, 0.1, -0.6) +const COURSE_MIN_X := -20.0 +const TOP_CHECKPOINT := Vector3(10.5, 36.5, -0.6) 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), + Vector3(-23, 0, -0.6), Vector3(0, 0.55, -0.6), Vector3(20.5, 0.5, -0.6), + Vector3(21.8, 3, 2.9), Vector3(20.5, 6, -0.6), Vector3(-20.5, 6, -0.6), + Vector3(-21.8, 9, 2.9), Vector3(-20.5, 12, -0.6), Vector3(20, 12.2, -0.6), + Vector3(21.8, 15, 2.9), Vector3(20, 18, -0.6), Vector3(14.4, 18.5, -0.6), + Vector3(1.2, 21.2, -0.6), Vector3(-20.5, 21.15, -0.6), + Vector3(-21.8, 23, 2.9), Vector3(-19, 25, -0.6), Vector3(-5, 25, -0.6), + Vector3(0, 31.3, -0.6), Vector3(4.4, 36.3, -0.6), Vector3(10, 36.3, -0.6), ] -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) +const TERRACE_BREAKS := [5.9, 11.9, 17.9, 24.5] +const NO_ROPE_BAND := Vector2(17.4, 21.4) +const RIVAL_CRUSH_BAND := Vector2(18.2, 21.4) var _checkpoint_position := BASE_SPAWN var _has_intervention_run := false var _has_run_started := false -var _reached_ascents: Dictionary = {} +var _reached_terraces: Dictionary = {} var _player: CharacterBody3D var _dragons: Array[Node3D] = [] @@ -86,33 +80,36 @@ var _dragons: Array[Node3D] = [] @onready var _mode: Node = $GauntletMode @onready var _climb: Node = $ClimbController @onready var _nerve: Node = $NerveSystem -@onready var _ropes: Node3D = $SafetyRopeSystem +@onready var _ropes: Node3D = $SafetyRopeField @onready var _timer: Node = $RunTimer @onready var _rivals: Node3D = $RivalClimbers @onready var _distraction: Node = $DragonDistraction +@onready var _curves: Array[Node3D] = [$Curve1, $Curve2, $Curve3, $Curve4] -## Baut Kurs-Umgebung, lädt das Tuning, verdrahtet Komponenten und -## Hindernisse und initialisiert Modus und Story-Zustand. +## Baut Kurs-Umgebung, lädt das Tuning, verdrahtet Komponenten, Kurven +## 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: - _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) + _nerve.setup(_player, COURSE_MIN_X) + _climb.setup(_player, _nerve, _mode, COURSE_MIN_X) + var anchors: Array[Vector3] = [Vector3(-23, 0, -0.6)] + for curve in _curves: + anchors.append(curve.get_exit_position()) + anchors.append(Vector3(10.5, 36.3, -0.6)) + var no_rope_bands: Array[Vector2] = [NO_ROPE_BAND] + _ropes.setup(_player, _mode, -20.0, 20.0, anchors, no_rope_bands) + _distraction.setup(_player, _nerve, _mode, _dragons, COURSE_MIN_X) _wire_obstacles() + for i in _curves.size(): + _curves[i].exit_reached.connect(_on_curve_exit.bind(i + 1)) $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) + _ropes.rope_touched.connect(_on_rope_touched) + _ropes.rope_missed.connect(_on_rope_missed) _rivals.rival_fell.connect(_on_rival_fell) _init_mode_and_story() @@ -123,7 +120,7 @@ func _physics_process(_delta: float) -> void: return if not _mode.is_exam() or DialogueSystem.is_dialogue_active: return - if _player.global_position.z < -5.0: + if _player.global_position.x > -19.5: _has_run_started = true _timer.start_run() _rivals.start() @@ -145,7 +142,7 @@ func _init_mode_and_story() -> void: _mode.manipulated = true _apply_manipulated_preset() var haste: float = _mode.rival_haste_scale() - _rivals.setup(SPINE, PackedFloat32Array(ASCENT_BREAKS), RIVAL_CRUSH_ZONE, haste) + _rivals.setup(SPINE, PackedFloat32Array(TERRACE_BREAKS), RIVAL_CRUSH_BAND, haste) $InterventionTrigger.body_entered.connect(_on_intervention_entered) _play_opening() @@ -163,15 +160,17 @@ func _play_opening() -> void: }) -## Lädt gauntlet_tuning.tres und die Ascent-Configs und verteilt die +## Lädt gauntlet_tuning.tres und die Terrassen-Configs und verteilt die ## Werte an Komponenten und Hindernisse (Verhaltens-Tunables; Geometrie- -## Werte stehen als Overrides direkt in den Ascent-Szenen). +## Werte stehen als Overrides direkt in den Terrassen-/Kurven-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_recover_time = tuning.rope_recover_time _ropes.rope_time_penalty = tuning.rope_time_penalty + _ropes.corridor_z = tuning.corridor_width - 0.6 + _ropes.course_min_x = COURSE_MIN_X _climb.grip_max = tuning.grip_max _climb.grip_drain_rate = tuning.grip_drain_rate _climb.grip_regen_rate = tuning.grip_regen_rate @@ -191,28 +190,27 @@ func _apply_tuning() -> void: _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(): + for i in TERRACE_CONFIG_PATHS.size(): + var config: TerraceConfig = load(TERRACE_CONFIG_PATHS[i]) + var terrace := get_node("Terrace%d" % (i + 1)) + for obstacle in terrace.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: +## Überträgt die Verhaltens-Tunables einer Terrassen-Config auf ein +## Hindernis. +func _apply_config_to_obstacle(config: TerraceConfig, 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. +## Rollgeschwindigkeit); Rad-Fenster, 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: @@ -229,33 +227,24 @@ func _wire_obstacles() -> void: 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. +## Baut die Kurs-Umgebung: Fuß-Plattform, Felswand, Box-Canyon-Plattform +## mit Engpass und Drachen sowie Rast-Zonen an Fuß und Ziel. 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)] + _build_platform(Vector3(-23.5, -0.5, -0.6), Vector3(6, 1, 6)) + _build_rest_zone(Vector3(-23.5, 1.5, -0.6), Vector3(6, 3, 6), false) + _build_platform(Vector3(10.5, 35.8, -0.6), Vector3(12, 1, 10)) + _build_rest_zone(Vector3(10.5, 37.5, -0.6), Vector3(12, 2.4, 10), true) + add_child(_make_mesh(Vector3(7, 4, 1.4), Vector3(9, 38.3, -4.8), Color(0.4, 0.38, 0.36))) + add_child(_make_mesh(Vector3(7, 4, 1.4), Vector3(9, 38.3, 3.6), Color(0.4, 0.38, 0.36))) + var dragon_spots := [Vector3(13, 36.3, -3.5), Vector3(15, 36.3, -2), Vector3(14, 36.3, 1.5), Vector3(16, 36.3, 0)] 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) + add_child(_make_mesh(Vector3(56, 42, 1), Vector3(0, 17, -3.1), Color(0.36, 0.34, 0.33))) -## Baut eine begehbare Plattform (Kies-Pfad, Fuß, Box-Canyon). +## Baut eine begehbare Plattform (Fuß, Box-Canyon). func _build_platform(center: Vector3, size: Vector3) -> void: var body := StaticBody3D.new() body.position = center @@ -268,9 +257,9 @@ func _build_platform(center: Vector3, size: Vector3) -> void: 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: +## Baut eine Rast-Zone (Gruppe gauntlet_rest); die Ziel-Zone schließt +## zusätzlich den Lauf ab. +func _build_rest_zone(center: Vector3, size: Vector3, is_finish: bool) -> void: var area := Area3D.new() area.collision_layer = 0 area.collision_mask = 2 @@ -281,7 +270,8 @@ func _build_rest_zone(center: Vector3, size: Vector3, index: int) -> void: box.size = size shape.shape = box area.add_child(shape) - area.body_entered.connect(_on_rest_zone_entered.bind(index, center.y)) + if is_finish: + area.body_entered.connect(_on_finish_entered) add_child(area) @@ -302,71 +292,68 @@ func _make_mesh(size: Vector3, position_offset: Vector3, color: Color) -> MeshIn 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) + dragon.add_child(_make_mesh(Vector3(1.6, 1.4, 2.8), Vector3(0, 0.7, 0), Color(0.18, 0.14, 0.16))) + dragon.add_child(_make_mesh(Vector3(0.5, 1.6, 0.5), Vector3(0, 1.8, 1.2), Color(0.18, 0.14, 0.16))) 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: +## Kurven-Ausstieg erreicht: Checkpoint (Training), Fortschritts-Höhe für +## die Descent-Sperre, terrace_completed + story_hook_reached einmalig. +func _on_curve_exit(index: int) -> void: + var exit_position: Vector3 = _curves[index - 1].get_exit_position() + _climb.set_progress_height(exit_position.y) + if _mode.is_training(): + _checkpoint_position = exit_position + if _reached_terraces.has(index): + return + _reached_terraces[index] = true + terrace_completed.emit(index) + story_hook_reached.emit(index) + + +## Ziel erreicht (Box-Canyon): Terrasse 5 abschließen und die Uhr stoppen. +func _on_finish_entered(body: Node3D) -> void: if not body.is_in_group("player"): return - _climb.set_progress_height(top_y) + _climb.set_progress_height(36.3) if _mode.is_training(): - _checkpoint_position = _rest_checkpoint(index) - if index == 0 or _reached_ascents.has(index): + _checkpoint_position = TOP_CHECKPOINT + if _reached_terraces.has(5): return - _reached_ascents[index] = true - ascent_completed.emit(index) - story_hook_reached.emit(index) - if index == 5: - _timer.stop_run() + _reached_terraces[5] = true + terrace_completed.emit(5) + story_hook_reached.emit(5) + _timer.stop_run() -## 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. +## Hindernis geschafft: Signal durchreichen. func _on_obstacle_cleared(obstacle_id: String) -> void: obstacle_cleared.emit(obstacle_id) -## Fehlgriff an einem Hindernis: Seilfang-Versuch. +## Fehlgriff an einem Hindernis: Seilfang-Versuch im Sturz. func _on_obstacle_fall(_source_id: String) -> void: _ropes.attempt_catch() -## Griff leer, Descent-Sperre oder Gegensteuer-QTE verloren: Seilfang. +## Griff leer oder Descent-Sperre gerissen: Seilfang-Versuch. func _on_climber_fell() -> void: _ropes.attempt_catch() -## Seilfang geglückt: Zeitstrafe auf den Lauf. -func _on_rope_caught(time_penalty: float) -> void: +## Seilberührung (Fang oder Streifen): Zeitstrafe auf den Lauf. +func _on_rope_touched(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: +## Kein Seil erreicht (verpasst oder No-Rope-Zone): Death-State. +func _on_rope_missed() -> void: _handle_death() ## Rival-Sturz in Sicht: Nerven-Anstieg. -func _on_rival_fell(_rival_id: int, _ascent_index: int) -> void: +func _on_rival_fell(_rival_id: int, _terrace_index: int) -> void: _nerve.add_nerve(_nerve.nerve_on_rival_fall) @@ -402,8 +389,8 @@ func _handle_death() -> void: _player.global_position = _checkpoint_position -## Startet den Wendepunkt einmalig, sobald Tyrveil den Sammel-Absatz vor -## Ascent 5 erreicht. +## Startet den Wendepunkt einmalig, sobald Tyrveil den Anfang von +## Terrasse 5 erreicht. func _on_intervention_entered(body: Node3D) -> void: if not body.is_in_group("player"): return @@ -448,7 +435,7 @@ func _run_climax(player: CharacterBody3D) -> void: _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) + _checkpoint_position = Vector3(-19, 25.3, -0.6) ## Legt Marens Mesh in Liegeposition; der Root bleibt aufrecht, damit diff --git a/scripts/gameplay/gauntlet_tuning.gd b/scripts/gameplay/gauntlet_tuning.gd index 02ab5b8..5505e5b 100644 --- a/scripts/gameplay/gauntlet_tuning.gd +++ b/scripts/gameplay/gauntlet_tuning.gd @@ -1,17 +1,23 @@ class_name GauntletTuning extends Resource -## Globales Tuning des Gauntlet-Parcours (CR-002), daten-getrieben unter -## data/gauntlet/gauntlet_tuning.tres. +## Globales Tuning des Gauntlet-Parcours (CR-002/CR-003), 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). +## Bündelt die szenenweiten Werte: Seilfeld im Sturzkorridor, Kurven, +## Zeitlauf, Griff, Nerven-System, Rival-Kadetten und Drachen-Ablenkung. +## Die Hindernis-Werte pro Terrasse liegen in den terrace_N.tres +## (TerraceConfig). @export var rope_spacing := 1.8 -@export var rope_catch_radius := 3.5 @export var rope_catch_window := 0.7 +@export var rope_recover_time := 1.2 @export var rope_time_penalty := 30.0 +@export var corridor_width := 3.0 + +@export var terrace_height_offset := 6.0 +@export var terrace_width := 2.4 +@export var curve_length := 4.0 +@export var curve_width := 0.9 @export var grip_max := 100.0 @export var grip_drain_rate := 3.5 @@ -30,7 +36,7 @@ extends Resource @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 rival_line_offsets: PackedFloat32Array = PackedFloat32Array([-0.7, -0.35, 0.35, 0.7, -1.0]) @export var distraction_enabled_baseline := false @export var distraction_interval_min := 6.0 diff --git a/scripts/gameplay/nerve_system.gd b/scripts/gameplay/nerve_system.gd index 7910125..b444709 100644 --- a/scripts/gameplay/nerve_system.gd +++ b/scripts/gameplay/nerve_system.gd @@ -25,17 +25,17 @@ var nerve := 0.0 var is_steadying := false var _player: CharacterBody3D -var _course_z := -4.0 +var _course_min_x := -20.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 +## Verknüpft den Spieler und die Kurs-Grenze (x, ab der der Parcours ## beginnt) und baut die HUD-Leiste. -func setup(player: CharacterBody3D, course_z: float) -> void: +func setup(player: CharacterBody3D, course_min_x: float) -> void: _player = player - _course_z = course_z + _course_min_x = course_min_x _build_hud() @@ -59,7 +59,7 @@ 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 + var is_in_course: bool = _player.global_position.x > _course_min_x or _player.global_position.y > 2.0 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 diff --git a/scripts/gameplay/obstacles/buoy_ball.gd b/scripts/gameplay/obstacles/buoy_ball.gd index 7b37437..286d050 100644 --- a/scripts/gameplay/obstacles/buoy_ball.gd +++ b/scripts/gameplay/obstacles/buoy_ball.gd @@ -63,13 +63,17 @@ func _physics_process(delta: float) -> void: _was_charging = is_charging -## Klammert den Spieler an die Kugel, wenn er frei in die Greif-Zone kommt. +## Klammert den Spieler an die Kugel, wenn er frei in die Greif-Zone +## kommt; der Abstands-Check fängt veraltete Zonen-Events der pendelnden +## Kugel ab (z. B. nach einem Respawn quer über die Terrasse). 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 + if to_local(player.global_position).distance_to(_ball.position) > 3.0: + return _is_holding = true _charge = 0.0 _was_charging = false diff --git a/scripts/gameplay/obstacles/rolling_log.gd b/scripts/gameplay/obstacles/rolling_log.gd index 875ddd1..6ac74e5 100644 --- a/scripts/gameplay/obstacles/rolling_log.gd +++ b/scripts/gameplay/obstacles/rolling_log.gd @@ -39,7 +39,7 @@ func _physics_process(delta: float) -> void: 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)) + player.external_push = global_transform.basis.z * roll_speed * float(roll_dir) _was_on_log = true elif _was_on_log: player.external_push = Vector3.ZERO diff --git a/scripts/gameplay/obstacles/shaking_pillar.gd b/scripts/gameplay/obstacles/shaking_pillar.gd index d01962b..b20bcd6 100644 --- a/scripts/gameplay/obstacles/shaking_pillar.gd +++ b/scripts/gameplay/obstacles/shaking_pillar.gd @@ -34,7 +34,7 @@ func _physics_process(delta: float) -> void: 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) + player.external_push = global_transform.basis.x * drift _was_on_pillar = true elif _was_on_pillar: player.external_push = Vector3.ZERO diff --git a/scripts/gameplay/obstacles/spinning_log.gd b/scripts/gameplay/obstacles/spinning_log.gd index 997f3fa..03ba1d0 100644 --- a/scripts/gameplay/obstacles/spinning_log.gd +++ b/scripts/gameplay/obstacles/spinning_log.gd @@ -38,7 +38,7 @@ func _physics_process(delta: float) -> void: var drift := log_spin_speed * log_radius if nerve != null: drift *= nerve.drift_factor() - player.external_push = Vector3(drift, 0.0, 0.0) + player.external_push = global_transform.basis.x * drift _was_on_log = true elif _was_on_log: player.external_push = Vector3.ZERO diff --git a/scripts/gameplay/obstacles/spinning_wheel.gd b/scripts/gameplay/obstacles/spinning_wheel.gd index 551d2b4..ff07a7e 100644 --- a/scripts/gameplay/obstacles/spinning_wheel.gd +++ b/scripts/gameplay/obstacles/spinning_wheel.gd @@ -1,109 +1,205 @@ extends GauntletObstacle -## Spinning Wheel (CR-002, ascent_1): großes, konstant drehendes Rad. +## Spinning Wheel als geschlossene Trommel (CR-003 §3b). ## -## 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. +## Die Trommel steht mit der Radebene parallel zur Felswand (Achse zeigt +## in die Wand); die äußere Haut ist durchgehend bis auf genau eine Lücke +## (wheel_gap_arc). Ablauf: (1) seitlich durch die Lücke einspringen, +## wenn sie an der Einstiegsseite vorbeikommt (wheel_entry_window), +## (2) innen auf der Trommel-Innenfläche mitlaufen — die Drehung trägt +## den Läufer sonst die Wand hoch (wheel_carry_force, A/D hält dagegen), +## (3) wandert die Lücke unter den Füßen durch, rechtzeitig darüber +## springen (gap_jump_window), sonst fällt er durch die Trommel, +## (4) an der gegenüberliegenden Seite im Fenster wheel_exit_window durch +## die Lücke hinausspringen. Zwei Dummy-Kadetten laufen sichtbar mit +## (Timing-Referenz). Ein vertimter Einsprung prallt an der Haut ab +## (Rückstoß, kein Tod); Fehler INNEN sind Stürze (player_fell). + +signal wheel_entered +signal wheel_gap_cleared +signal wheel_exited @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) +@export var wheel_dir := 1 +@export var wheel_gap_arc := 1.0 +@export var wheel_entry_window := 0.6 +@export var gap_jump_window := 0.6 +@export var wheel_exit_window := 0.5 +@export var wheel_carry_force := 0.35 +@export var carry_limit := 0.9 var _pivot: Node3D +var _dummy1: MeshInstance3D +var _dummy2: MeshInstance3D var _is_riding := false -var _ride_angle := 0.0 +var _is_in_entry_zone := false +var _player_angle := 0.0 +var _hop_timer := 0.0 +var _has_cleared_pass := false +var _time := 0.0 -## Baut Rad-Visual (Speichen + Kranz-Segmente), Dummy-Kadetten, -## Einstiegs-Zone und Ausstiegs-Plattform. +## Baut Haut-Segmente (mit Lücke), Nabe, 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 + var gap_half := wheel_gap_arc / 2.0 + var segment_count := 14 + var arc := TAU - wheel_gap_arc + for i in segment_count: + var angle := gap_half + arc * (float(i) + 0.5) / float(segment_count) + var segment := build_box_mesh(Vector3(arc / float(segment_count) * radius + 0.12, 0.3, 1.7), Vector3(sin(angle) * radius, -cos(angle) * radius, 0), Color(0.5, 0.4, 0.3)) + segment.rotation.z = 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" + add_child(build_box_mesh(Vector3(0.5, 0.5, 2.0), Vector3.ZERO, Color(0.35, 0.3, 0.25))) + _dummy1 = build_box_mesh(Vector3(0.45, 1.3, 0.45), Vector3.ZERO, Color(0.35, 0.35, 0.5)) + add_child(_dummy1) + _dummy2 = build_box_mesh(Vector3(0.45, 1.3, 0.45), Vector3.ZERO, Color(0.3, 0.4, 0.45)) + add_child(_dummy2) + var entry := build_area(self, Vector3(1.8, 2.0, 2.0), Vector3(-radius - 1.0, -radius + 1.0, 0)) + entry.body_entered.connect(_on_entry_zone_entered) + entry.body_exited.connect(_on_entry_zone_exited) + build_box(self, Vector3(1.8, 0.5, 1.8), Vector3(radius + 1.4, -radius + 0.25, 0), Color(0.55, 0.54, 0.52)) -## Dreht Rad und Dummy-Kadetten; während der Fahrt wird der Spieler auf -## der Kreisbahn geführt und der Ausstieg abgefragt. +## Merkt, dass der Spieler in der Einstiegs-Zone steht. +func _on_entry_zone_entered(body: Node3D) -> void: + if body.is_in_group("player"): + _is_in_entry_zone = true + + +## Merkt, dass der Spieler die Einstiegs-Zone verlassen hat. +func _on_entry_zone_exited(body: Node3D) -> void: + if body.is_in_group("player"): + _is_in_entry_zone = false + if not _is_riding: + hide_prompt() + + +## Dreht die Trommel, positioniert Dummy-Kadetten und treibt Einstieg, +## Mitlaufen, Lücken-Sprung und Ausstieg an. func _physics_process(delta: float) -> void: - _pivot.rotate_x(-wheel_speed * delta) + _time += delta + _pivot.rotate_z(wheel_speed * float(wheel_dir) * 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 inner := radius - 0.55 + _dummy1.position = Vector3(sin(0.55 + sin(_time * 2.0) * 0.08) * inner, -cos(0.55) * inner + 0.65, 0.4) + _dummy2.position = Vector3(sin(-0.5 + sin(_time * 1.7) * 0.08) * inner, -cos(-0.5) * inner + 0.65, -0.4) 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") + if _is_riding: + _process_ride(player, delta, inner) 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) + _process_entry(player) + + +## Einstieg: In der Zone warten, bis die Lücke links vorbeikommt, dann +## Leertaste; vertimter Sprung prallt an der Haut ab. +func _process_entry(player: CharacterBody3D) -> void: + if not _is_in_entry_zone or not is_player_free(player): + return + var is_gap_at_entry := _angle_distance(_gap_angle(), -PI / 2.0) < _window_tolerance(wheel_entry_window) + if is_gap_at_entry: + show_prompt("JETZT: durch die Lücke! — Leertaste / A-Taste") + else: + show_prompt("Warten, bis die Lücke links ist — Leertaste / A-Taste") + if not Input.is_action_just_pressed("jump"): + return + hide_prompt() + if is_gap_at_entry: + _is_riding = true + _player_angle = 0.0 + _hop_timer = 0.0 + _has_cleared_pass = false + player.set_control_locked(true) + wheel_entered.emit() + else: + player.velocity = global_transform.basis.x * -3.0 + Vector3(0, 2.0, 0) + + +## Fahrt in der Trommel: Mitlaufen gegen die Drehung, Lücke überspringen, +## Ausstieg an der Gegenseite timen. +func _process_ride(player: CharacterBody3D, delta: float, inner: float) -> void: + _hop_timer = maxf(_hop_timer - delta, 0.0) + _player_angle += wheel_speed * float(wheel_dir) * wheel_carry_force * delta + _player_angle += Input.get_axis("move_left", "move_right") * 1.1 * delta + player.velocity = Vector3.ZERO + player.global_position = to_global(Vector3(sin(_player_angle) * inner, -cos(_player_angle) * inner, 0)) + if absf(_player_angle) > carry_limit: + _fail_ride(player, Vector3(0, 2.0, 0)) + return + var gap := _gap_angle() + var gap_half := wheel_gap_arc / 2.0 + var is_gap_under := _angle_distance(gap, _player_angle) < gap_half * 0.7 + var is_exit_window := _angle_distance(gap, PI / 2.0) < _window_tolerance(wheel_exit_window) + if is_gap_under: + if _hop_timer > 0.0 or _has_cleared_pass: + if not _has_cleared_pass: + _has_cleared_pass = true + wheel_gap_cleared.emit() else: - _finish_ride(false) + player.global_position = to_global(Vector3(sin(_player_angle) * (inner + 0.8), -cos(_player_angle) * (inner + 0.8), 0)) + _fail_ride(player, Vector3(0, -6.5, 0)) + return + else: + _has_cleared_pass = false + if is_exit_window: + show_prompt("AUSSTIEG rechts: durch die Lücke! — Leertaste / A-Taste") + elif _angle_distance(gap, _player_angle) < gap_half + 0.6: + show_prompt("Die Lücke kommt: DRÜBERSPRINGEN — Leertaste / A-Taste") + else: + show_prompt("Mitlaufen: A/D bzw. Stick gegen die Drehung") + if Input.is_action_just_pressed("jump"): + if is_exit_window: + _finish_ride(player) + else: + _hop_timer = gap_jump_window -## 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: +## Erfolgreicher Ausstieg durch die Lücke auf die Plattform dahinter. +func _finish_ride(player: CharacterBody3D) -> 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() + var radius := wheel_diameter / 2.0 + player.global_position = to_global(Vector3(radius + 1.4, -radius + 1.0, 0)) + player.velocity = Vector3.ZERO + wheel_exited.emit() + mark_cleared() -## 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) +## Sturz in der Trommel (mitgerissen oder durch die Lücke gefallen). +func _fail_ride(player: CharacterBody3D, exit_velocity: Vector3) -> void: + _is_riding = false + hide_prompt() + player.set_control_locked(false) + player.velocity = exit_velocity + report_fall() -## Meldet, ob der Spieler gerade im Rad mitfährt (für Tests). +## Aktuelle Welt-Winkelposition der Lücke (0 = unten, +pi/2 = rechts). +func _gap_angle() -> float: + return wrapf(_pivot.rotation.z, -PI, PI) + + +## Toleranz eines Zeitfensters als Winkel (skaliert mit der Drehung und +## dem manipulated-Fenster des Modus). +func _window_tolerance(window: float) -> float: + var scaled := window + if mode != null: + scaled *= mode.window_scale() + return maxf(wheel_gap_arc * 0.4 + wheel_speed * scaled * 0.5, 0.2) + + +## Kleinste Winkeldistanz zweier Winkel. +func _angle_distance(a: float, b: float) -> float: + return absf(wrapf(a - b, -PI, PI)) + + +## Meldet, ob der Spieler gerade in der Trommel mitfährt (für Tests). func is_riding() -> bool: return _is_riding diff --git a/scripts/gameplay/obstacles/vertical_ramp.gd b/scripts/gameplay/obstacles/vertical_ramp.gd index 4228163..6388882 100644 --- a/scripts/gameplay/obstacles/vertical_ramp.gd +++ b/scripts/gameplay/obstacles/vertical_ramp.gd @@ -33,7 +33,7 @@ func _physics_process(_delta: float) -> void: 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) + player.external_push = global_transform.basis.z * slide_back_push else: player.external_push = Vector3.ZERO _was_on_ramp = true diff --git a/scripts/gameplay/rival_climbers.gd b/scripts/gameplay/rival_climbers.gd index 88190b9..be4617b 100644 --- a/scripts/gameplay/rival_climbers.gd +++ b/scripts/gameplay/rival_climbers.gd @@ -1,25 +1,27 @@ extends Node3D -## Rival-Kadetten des Ernstlaufs (CR-002 §7) — rein ambient. +## Rival-Kadetten des Ernstlaufs (CR-002 §7, Serpentine per CR-003) — +## 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. +## Nur im exam-Modus: rival_count Kadetten-Silhouetten laufen die +## Terrassen-Serpentine auf quer versetzten Linien (rival_line_offsets, +## seitlich zur Laufrichtung) ab, 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 das Höhenband der Rolling Logs erreicht, +## dort IMMER (Quetschung). Im manipulated-Preset läuft der Zeitplan +## gerafft. Jeder Sturz speist über rival_fell das Nerven-System — +## Sichtlinie darauf bieten besonders die Kurven. -signal rival_fell(rival_id: int, ascent_index: int) +signal rival_fell(rival_id: int, terrace_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]) +@export var rival_line_offsets: PackedFloat32Array = PackedFloat32Array([-0.7, -0.35, 0.35, 0.7, -1.0]) var _spine: Array[Vector3] = [] -var _ascent_breaks: PackedFloat32Array = PackedFloat32Array() -var _crush_zone := Vector2.ZERO +var _terrace_breaks: PackedFloat32Array = PackedFloat32Array() +var _crush_band := Vector2.ZERO var _rivals: Array[Node3D] = [] var _distances: Array[float] = [] var _is_active := false @@ -29,19 +31,19 @@ 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: +## Verknüpft Serpentinen-Linie, Terrassen-Grenzen (Höhen) und das +## Quetsch-Höhenband der Rolling Logs und spawnt die Kadetten. +func setup(spine: Array[Vector3], terrace_breaks: PackedFloat32Array, crush_band: Vector2, haste_scale: float) -> void: _spine = spine - _ascent_breaks = ascent_breaks - _crush_zone = crush_zone + _terrace_breaks = terrace_breaks + _crush_band = crush_band 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)) + _distances.append(-3.0 * float(i)) if haste_scale != 1.0: for i in rival_fall_schedule.size(): rival_fall_schedule[i] *= haste_scale @@ -60,7 +62,7 @@ func stop() -> void: rival.visible = false -## Anzahl noch kletternder Kadetten (für Tests/Overlay). +## Anzahl noch laufender Kadetten (für Tests/Overlay). func alive_count() -> int: var count := 0 for rival in _rivals: @@ -69,8 +71,8 @@ func alive_count() -> int: return count -## Bewegt die Kadetten die Linie hinauf und arbeitet den Sturz-Zeitplan -## sowie den Kanon-Tod an den Rolling Logs ab. +## Bewegt die Kadetten die Serpentine entlang 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 @@ -82,9 +84,9 @@ func _physics_process(delta: float) -> void: _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()] + point.z += 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: + if not _has_crush_death and point.y >= _crush_band.x and point.y <= _crush_band.y: _has_crush_death = true _kill_rival(i) continue @@ -95,7 +97,7 @@ func _physics_process(delta: float) -> void: ## Lässt den nächsten planmäßigen Kadetten stürzen (sofern noch einer -## klettert). +## läuft). func _kill_scheduled() -> void: _next_fall += 1 for i in _rivals.size(): @@ -108,22 +110,22 @@ func _kill_scheduled() -> void: ## Signal an das Nerven-System. func _kill_rival(index: int) -> void: var rival := _rivals[index] - var ascent := _ascent_at(rival.global_position.z) + var terrace := _terrace_at(rival.global_position.y) 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) + rival_fell.emit(index, terrace) -## 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]: +## Ordnet eine Höhe dem Terrassen-Index 1..5 zu. +func _terrace_at(y: float) -> int: + for i in _terrace_breaks.size(): + if y < _terrace_breaks[i]: return i + 1 - return _ascent_breaks.size() + 1 + return _terrace_breaks.size() + 1 -## Interpoliert einen Punkt in gegebener Distanz entlang der Kurs-Linie. +## Interpoliert einen Punkt in gegebener Distanz entlang der Serpentine. func _sample_spine(travelled: float) -> Vector3: var remaining := travelled for i in _spine.size() - 1: diff --git a/scripts/gameplay/safety_rope_field.gd b/scripts/gameplay/safety_rope_field.gd new file mode 100644 index 0000000..834213e --- /dev/null +++ b/scripts/gameplay/safety_rope_field.gd @@ -0,0 +1,226 @@ +extends Node3D +## Seilfeld im Sturzkorridor (CR-003 §4) — ersetzt die Wand-Anker aus +## CR-002. +## +## Die Seile hängen frei AUSSEN im Sturzkorridor vor der offenen +## Terrassen-Seite, über die volle Wandhöhe, im Abstand rope_spacing. +## Der Seilfang ist ein Fall-Feature: Stürzt Tyrveil nach außen, fällt +## sie ins Seilfeld und bekommt ein Greif-Fenster (rope_catch_window, +## Leertaste/A). Erfolg: Sie hängt frei am Seil, arbeitet sich in +## rope_recover_time zurück auf den letzten sicheren Absatz und kassiert +## rope_time_penalty. Fehlschlag: Sie fällt durch das Feld -> rope_missed +## (Death-State). JEDE Seilberührung zählt: Auch wer im Lauf ein Seil +## streift, kassiert die Strafe (rope_touched). Stürze, die auf der +## No-Rope-Terrasse beginnen (Rolling Logs), gehen den Hang hinab und +## erreichen das Feld nie -> kein Fang, sicher tödlich. Im Ernstlauf gibt +## es kein Abklettern am Seil (Descent-Sperre im climb_controller). + +signal rope_touched(time_penalty: float) +signal rope_caught +signal rope_missed + +@export var rope_spacing := 1.8 +@export var rope_catch_window := 0.7 +@export var rope_recover_time := 1.2 +@export var rope_time_penalty := 30.0 +@export var corridor_z := 2.4 +@export var corridor_top := 32.0 +@export var touch_radius := 0.5 +@export var course_min_x := -20.0 + +var _player: CharacterBody3D +var _mode: Node +var _rope_xs: PackedFloat32Array = PackedFloat32Array() +var _anchors: Array[Vector3] = [] +var _no_rope_bands: Array[Vector2] = [] +var _last_floor_y := 0.0 +var _is_catching := false +var _touch_cooldown := 0.0 +var _label: Label + + +## Verknüpft Spieler und Modus, hängt die Seile über den x-Bereich des +## Kurses und merkt sichere Absätze sowie No-Rope-Bänder (Absturz- +## Ursprungshöhen der Rolling-Logs-Terrasse). +func setup(player: CharacterBody3D, gauntlet_mode: Node, x_min: float, x_max: float, anchors: Array[Vector3], no_rope_bands: Array[Vector2]) -> void: + _player = player + _mode = gauntlet_mode + _anchors = anchors + _no_rope_bands = no_rope_bands + var x := x_min + while x <= x_max: + _rope_xs.append(x) + add_child(_make_rope_visual(x)) + x += rope_spacing + _build_ui() + + +## Anzahl gespannter Seile (für Tests/Overlay). +func rope_count() -> int: + return _rope_xs.size() + + +## Meldet, ob gerade ein Greif-Fenster oder die Hang-Phase läuft. +func is_catching() -> bool: + return _is_catching + + +## Prüft, ob eine Absturz-Ursprungshöhe in einem No-Rope-Band liegt. +func is_in_no_rope(origin_y: float) -> bool: + for band in _no_rope_bands: + if origin_y >= band.x and origin_y <= band.y: + return true + return false + + +## Verfolgt die letzte sichere Standhöhe, erkennt freie Stürze und +## Seil-Berührungen im Vorbeigehen. +func _physics_process(delta: float) -> void: + if _player == null or DialogueSystem.is_dialogue_active: + return + _touch_cooldown = maxf(_touch_cooldown - delta, 0.0) + if _is_catching or _player.is_control_locked(): + return + if _player.is_on_floor(): + _last_floor_y = _player.global_position.y + if not _is_in_course(): + return + _check_passing_touch() + if _player.velocity.y < -6.0: + attempt_catch() + + +## Startet den Seilfang-Versuch: In No-Rope-Zonen gibt es keinen Fang +## (rope_missed), sonst öffnet das Greif-Fenster im Fall. +func attempt_catch() -> void: + if _is_catching: + return + if is_in_no_rope(_last_floor_y): + rope_missed.emit() + return + _is_catching = true + _run_catch_qte() + + +## Spielt Greif-Fenster und Hang-Phase als Coroutine: Der Fall friert +## kurz ein, Leertaste/A greift; danach hängt Tyrveil rope_recover_time +## am Seil und wird auf den letzten sicheren Absatz gesetzt. Der erste +## Physik-Frame wird übersprungen, damit der Tastendruck, der den Sturz +## auslöste, nicht sofort als Griff zählt. +func _run_catch_qte() -> 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 + if not is_caught: + _label.visible = false + _player.set_control_locked(false) + _is_catching = false + _player.velocity = Vector3(0, -6, 0) + rope_missed.emit() + return + rope_caught.emit() + rope_touched.emit(rope_time_penalty) + var rope_x := _nearest_rope_x(frozen.x) + var hang := Vector3(rope_x, maxf(frozen.y, 2.0), corridor_z - 0.5) + _label.text = "Am Seil — zurückarbeiten …" + var hang_start := Time.get_ticks_msec() + while float(Time.get_ticks_msec() - hang_start) / 1000.0 < rope_recover_time: + _player.velocity = Vector3.ZERO + _player.global_position = hang + await get_tree().physics_frame + _label.visible = false + _player.set_control_locked(false) + _is_catching = false + _land_at_anchor(hang) + + +## Setzt Tyrveil nach der Hang-Phase auf den nächsten sicheren Absatz +## unterhalb der Fangstelle. +func _land_at_anchor(hang: Vector3) -> void: + var best := _anchors[0] + var best_distance := INF + for anchor in _anchors: + if anchor.y > hang.y + 1.5: + continue + var distance := anchor.distance_to(hang) + if distance < best_distance: + best_distance = distance + best = anchor + _player.global_position = best + Vector3(0, 0.2, 0) + _player.velocity = Vector3.ZERO + + +## Berührung im Vorbeigehen: Wer einem hängenden Seil zu nahe kommt, +## kassiert die Zeitstrafe (mit Abkling-Sperre gegen Mehrfach-Zählung). +func _check_passing_touch() -> void: + if _touch_cooldown > 0.0: + return + var position := _player.global_position + if absf(position.z - corridor_z) > touch_radius: + return + var rope_x := _nearest_rope_x(position.x) + if absf(position.x - rope_x) > touch_radius: + return + _touch_cooldown = 3.0 + rope_touched.emit(rope_time_penalty) + + +## Liefert die x-Position des nächstgelegenen Seils. +func _nearest_rope_x(x: float) -> float: + var best := _rope_xs[0] + for rope_x in _rope_xs: + if absf(rope_x - x) < absf(best - x): + best = rope_x + return best + + +## Prüft, ob Tyrveil den Parcours betreten hat (jenseits des Fußes). +func _is_in_course() -> bool: + return _player.global_position.x > course_min_x or _player.global_position.y > 2.0 + + +## Baut das hängende Seil-Visual über die volle Wandhöhe. +func _make_rope_visual(x: float) -> MeshInstance3D: + var mesh_instance := MeshInstance3D.new() + var mesh := BoxMesh.new() + mesh.size = Vector3(0.07, corridor_top + 8.0, 0.07) + var material := StandardMaterial3D.new() + material.albedo_color = Color(0.85, 0.8, 0.6) + mesh.material = material + mesh_instance.mesh = mesh + mesh_instance.position = Vector3(x, corridor_top / 2.0 - 4.0, corridor_z) + 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_field.gd.uid similarity index 100% rename from scripts/gameplay/safety_rope_system.gd.uid rename to scripts/gameplay/safety_rope_field.gd.uid diff --git a/scripts/gameplay/safety_rope_system.gd b/scripts/gameplay/safety_rope_system.gd deleted file mode 100644 index 161b18c..0000000 --- a/scripts/gameplay/safety_rope_system.gd +++ /dev/null @@ -1,198 +0,0 @@ -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/ascent_config.gd b/scripts/gameplay/terrace_config.gd similarity index 62% rename from scripts/gameplay/ascent_config.gd rename to scripts/gameplay/terrace_config.gd index b3a901f..87e528e 100644 --- a/scripts/gameplay/ascent_config.gd +++ b/scripts/gameplay/terrace_config.gd @@ -1,28 +1,33 @@ -class_name AscentConfig +class_name TerraceConfig extends Resource -## Tuning eines einzelnen Gauntlet-Ascents (CR-002), daten-getrieben unter -## data/gauntlet/ascent_N.tres. +## Tuning einer einzelnen Gauntlet-Terrasse (CR-003), daten-getrieben +## unter data/gauntlet/terrace_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. +## Superset aller Hindernis-Tunables der fünf Terrassen; jede Resource +## befüllt nur die für ihre Terrasse relevanten Felder. gauntlet.gd +## verteilt die Werte beim Start an die Hindernis-Instanzen der Terrasse. -@export var ascent_index := 1 +@export var terrace_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 wheel_speed := 0.8 +@export var wheel_dir := 1 +@export var wheel_gap_arc := 1.0 +@export var wheel_entry_window := 0.6 +@export var gap_jump_window := 0.6 +@export var wheel_exit_window := 0.5 +@export var wheel_carry_force := 0.35 @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 diff --git a/scripts/gameplay/ascent_config.gd.uid b/scripts/gameplay/terrace_config.gd.uid similarity index 100% rename from scripts/gameplay/ascent_config.gd.uid rename to scripts/gameplay/terrace_config.gd.uid