CRs: Umbenennung raus, Dialog-Maus + Abbruch-Hinweis, Viadukt 4x, Wren laeuft
- Charakter-Anlage entfernt: Neues Spiel fuehrt direkt aufs Viadukt, player_name zurueckgebaut (Anzeigename aus der speakers-Map, fix Tyrveil) - Dialog-Box: Hinweis X/Esc - Gespraech beenden (bei can_abort:false ausgeblendet); Maus wird im Dialog freigegeben und danach wieder eingefangen, Antwort-Buttons damit klickbar - Viadukt von ~55 m auf ~220 m: Gelaender-Steg, zwei versetzte Sprungluecken, Kletterstelle, 32-m-Wandgang, 36-m-gelaenderloser Zickzack-Steg, Rastplattform, Doppel-Kletterpartie mit Absprung, Insel-Spruenge, breite Wren-Passage; acht Checkpoints - Wren laeuft das Viadukt entlang (stoppt zoegernd an der kippenden Platte), Straucheln loest beim Einholen aus (3,5 m), Ausloese-Zone weg - Headless verifiziert; zwei Maus-Capture-Checks schlagen nur headless fehl (Capture ist ohne Display ein No-op, isoliert nachgewiesen) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
3cdf5f6ac5
commit
2ee3c3f782
12 changed files with 471 additions and 286 deletions
|
|
@ -3,6 +3,60 @@
|
|||
> Abgearbeitete Change Requests aus CHANGEREQUESTS.md, mit Datum und
|
||||
> Anmerkung, was geändert wurde.
|
||||
|
||||
## 2026-07-05 — Charakter-Umbenennung entfernt
|
||||
|
||||
**Request:** „ich möchte doch nicht das man den Char umnennen kann. Man ist
|
||||
Tyrveil, das ist der Protagonist und nicht irgend jemand custom"
|
||||
|
||||
**Umsetzung:** Die Charakter-Anlage aus Phase 3 ist komplett entfernt
|
||||
(Szene + Skript gelöscht), „Neues Spiel" führt wieder direkt aufs
|
||||
Viadukt. GameState.player_name wurde zurückgebaut; der Anzeigename in der
|
||||
Dialog-Box kommt wie zuvor aus der speakers-Map der Dialogdateien und
|
||||
lautet überall „Tyrveil". Falls später eine Charakter-Anlage für andere
|
||||
Zwecke gewünscht ist (z. B. Permadeath-Wahl beim Start), wird sie ohne
|
||||
Namensfeld neu aufgebaut.
|
||||
|
||||
## 2026-07-05 — Abbruch-Hinweis sichtbar + Maus-Bedienung im Dialog
|
||||
|
||||
**Request:** „ich seh kein X zum abbrechen vom Gespräch + würde ich dadrin
|
||||
auch gerne mit der Maus navigieren können und nicht nur mit Pfeiltasten
|
||||
und Enter."
|
||||
|
||||
**Umsetzung:** Die Dialog-Box zeigt jetzt unten rechts den Hinweis
|
||||
„X / Esc — Gespräch beenden" — außer bei nicht abbrechbaren Dialogen wie
|
||||
dem Wren-Moment, dort bleibt er ausgeblendet. Die Maus wird bei
|
||||
Dialogbeginn freigegeben (vorher war sie gefangen, deshalb ging Klicken
|
||||
nicht) und nach Dialogende wieder eingefangen; die Antwort-Buttons sind
|
||||
damit voll per Mausklick bedienbar, Klicks ins Leere fangen die Maus
|
||||
während des Dialogs nicht mehr ein.
|
||||
|
||||
## 2026-07-05 — Viadukt auf gut 4-fache Länge ausgebaut
|
||||
|
||||
**Request:** Viadukt „viel zu kurz", mindestens 4-5-fache Länge mit klar
|
||||
unterschiedlichen Gefahren-Abschnitten (Wandgang, geländerloser Steg,
|
||||
variierte Wiederholungen).
|
||||
|
||||
**Umsetzung:** Strecke von ~55 m auf ~220 m ausgebaut, mit zehn
|
||||
unterscheidbaren Abschnitten: Geländer-Steg, zwei versetzte Sprunglücken
|
||||
(einmal gerade, einmal diagonal), Kletter-Engstelle, 32-m-Wandgang (1 m
|
||||
Sims an einer 4-m-Wand), 36-m-geländerloser Zickzack-Steg (1 m breit, mit
|
||||
Querstück und Richtungswechsel), Rastplattform, Doppel-Kletterpartie über
|
||||
zwei Ebenen mit 4-m-Absprung, Insel-Sprünge (drei kurze Lücken mit
|
||||
Versatz), breite Wren-Passage, Endplattform. Acht Checkpoints statt drei
|
||||
(Permadeath AUS respawnt am jeweiligen Abschnittsanfang).
|
||||
|
||||
## 2026-07-05 — Wren läuft das Viadukt entlang, Auslösung beim Einholen
|
||||
|
||||
**Request:** Wren soll nicht stehen und warten; er geht das Viadukt
|
||||
entlang, Tyrveil holt ihn ein, das Straucheln löst aus dem Einholen aus.
|
||||
|
||||
**Umsetzung:** Wren startet in der breiten Passage vor dem Spieler und
|
||||
geht langsam (1,2 m/s) das Viadukt entlang; an der kippenden Platte
|
||||
bleibt er zögernd stehen, falls Tyrveil trödelt. Das Straucheln löst
|
||||
distanzbasiert aus (Einholen auf 3,5 m), egal wo auf seinem Weg — die
|
||||
feste Auslöse-Zone ist entfernt. Headless verifiziert (Bewegung,
|
||||
Proximity-Auslösung, weiterhin nicht abbrechbar, Flag-Semantik).
|
||||
|
||||
## 2026-07-05 — X-Taste bricht Gespräche ab, zufällige Abschieds-Zeilen pro Charakter
|
||||
|
||||
**Request:** „Bau ein X zum abbrechen der Gespräche ein. für jeden Char
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
[gd_scene load_steps=2 format=3]
|
||||
|
||||
[ext_resource type="Script" path="res://scripts/ui/character_creation.gd" id="1_creation"]
|
||||
|
||||
[node name="CharacterCreation" type="Control"]
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
script = ExtResource("1_creation")
|
||||
|
||||
[node name="Background" type="ColorRect" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
color = Color(0.07, 0.08, 0.1, 1)
|
||||
|
||||
[node name="CenterContainer" type="CenterContainer" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
||||
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/separation = 16
|
||||
|
||||
[node name="TitleLabel" type="Label" parent="CenterContainer/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 40
|
||||
text = "Wer bist du, Gezeichneter?"
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="HintLabel" type="Label" parent="CenterContainer/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 16
|
||||
theme_override_colors/font_color = Color(0.7, 0.7, 0.7, 1)
|
||||
text = "Name eintippen (Tastatur) oder den Vorschlag bestätigen (Controller)."
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="TitleSpacer" type="Control" parent="CenterContainer/VBoxContainer"]
|
||||
custom_minimum_size = Vector2(0, 12)
|
||||
layout_mode = 2
|
||||
|
||||
[node name="NameEdit" type="LineEdit" parent="CenterContainer/VBoxContainer"]
|
||||
custom_minimum_size = Vector2(320, 44)
|
||||
layout_mode = 2
|
||||
max_length = 24
|
||||
alignment = 1
|
||||
|
||||
[node name="Buttons" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/separation = 12
|
||||
alignment = 1
|
||||
|
||||
[node name="ConfirmButton" type="Button" parent="CenterContainer/VBoxContainer/Buttons"]
|
||||
custom_minimum_size = Vector2(180, 44)
|
||||
layout_mode = 2
|
||||
text = "Bestätigen"
|
||||
|
||||
[node name="BackButton" type="Button" parent="CenterContainer/VBoxContainer/Buttons"]
|
||||
custom_minimum_size = Vector2(180, 44)
|
||||
layout_mode = 2
|
||||
text = "Zurück"
|
||||
|
|
@ -49,3 +49,9 @@ autowrap_mode = 3
|
|||
[node name="OptionsBox" type="VBoxContainer" parent="Root/Panel/Margin/Content"]
|
||||
visible = false
|
||||
theme_override_constants/separation = 6
|
||||
|
||||
[node name="AbortHint" type="Label" parent="Root/Panel/Margin/Content"]
|
||||
theme_override_colors/font_color = Color(0.6, 0.6, 0.6, 1)
|
||||
theme_override_font_sizes/font_size = 14
|
||||
text = "X / Esc — Gespräch beenden"
|
||||
horizontal_alignment = 2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=31 format=3]
|
||||
[gd_scene load_steps=52 format=3]
|
||||
|
||||
[ext_resource type="Script" path="res://scripts/gameplay/viaduct.gd" id="1_viaduct"]
|
||||
[ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"]
|
||||
|
|
@ -21,40 +21,33 @@ tonemap_mode = 2
|
|||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_stone"]
|
||||
albedo_color = Color(0.45, 0.44, 0.42, 1)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_platform"]
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_platform8"]
|
||||
size = Vector3(8, 1, 8)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_platform"]
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_platform8"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(8, 1, 8)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_walkway"]
|
||||
size = Vector3(2, 1, 10)
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_walk20"]
|
||||
size = Vector3(2, 1, 20)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_walkway"]
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_walk20"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 1, 10)
|
||||
size = Vector3(2, 1, 20)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_connector"]
|
||||
size = Vector3(2, 1, 3)
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_walk8"]
|
||||
size = Vector3(2, 1, 8)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_connector"]
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_walk8"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 1, 3)
|
||||
size = Vector3(2, 1, 8)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_wide"]
|
||||
size = Vector3(4, 1, 10)
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_walk6"]
|
||||
size = Vector3(2, 1, 6)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_wide"]
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_walk6"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(4, 1, 10)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_wall"]
|
||||
size = Vector3(2, 2, 2)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_wall"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 2, 2)
|
||||
size = Vector3(2, 1, 6)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_rail"]
|
||||
size = Vector3(0.3, 1, 4)
|
||||
|
|
@ -63,6 +56,90 @@ size = Vector3(0.3, 1, 4)
|
|||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(0.3, 1, 4)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_wall2"]
|
||||
size = Vector3(2, 2, 2)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_wall2"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 2, 2)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_trans4"]
|
||||
size = Vector3(4, 1, 4)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_trans4"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(4, 1, 4)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_ledge32"]
|
||||
size = Vector3(1, 1, 32)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_ledge32"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(1, 1, 32)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_sidewall"]
|
||||
size = Vector3(3, 4, 32)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_sidewall"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(3, 4, 32)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_narrow18"]
|
||||
size = Vector3(1, 1, 18)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_narrow18"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(1, 1, 18)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_cross6"]
|
||||
size = Vector3(6, 1, 1)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_cross6"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(6, 1, 1)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_rest46"]
|
||||
size = Vector3(4, 1, 6)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_rest46"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(4, 1, 6)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_elev2"]
|
||||
size = Vector3(2, 2, 6)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_elev2"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 2, 6)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_elev4"]
|
||||
size = Vector3(2, 4, 6)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_elev4"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 4, 6)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_island"]
|
||||
size = Vector3(2, 1, 2)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_island"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 1, 2)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_wide28"]
|
||||
size = Vector3(4, 1, 28)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_wide28"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(4, 1, 28)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_conn4"]
|
||||
size = Vector3(2, 1, 4)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_conn4"]
|
||||
material = SubResource("StandardMaterial3D_stone")
|
||||
size = Vector3(2, 1, 4)
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wren"]
|
||||
albedo_color = Color(0.45, 0.72, 0.45, 1)
|
||||
|
||||
|
|
@ -87,14 +164,11 @@ material = SubResource("StandardMaterial3D_trigger")
|
|||
size = Vector3(2, 2, 2)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_killzone"]
|
||||
size = Vector3(60, 6, 80)
|
||||
size = Vector3(100, 6, 260)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_checkpoint"]
|
||||
size = Vector3(3, 2, 2)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_wren_trigger"]
|
||||
size = Vector3(4, 3, 3)
|
||||
|
||||
[node name="Viaduct" type="Node3D"]
|
||||
script = ExtResource("1_viaduct")
|
||||
|
||||
|
|
@ -109,94 +183,256 @@ shadow_enabled = true
|
|||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="StartPlatform"]
|
||||
shape = SubResource("BoxShape3D_platform")
|
||||
shape = SubResource("BoxShape3D_platform8")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="StartPlatform"]
|
||||
mesh = SubResource("BoxMesh_platform")
|
||||
mesh = SubResource("BoxMesh_platform8")
|
||||
|
||||
[node name="Walk1a" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -9)
|
||||
[node name="WalkA" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -14)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Walk1a"]
|
||||
shape = SubResource("BoxShape3D_walkway")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="WalkA"]
|
||||
shape = SubResource("BoxShape3D_walk20")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="Walk1a"]
|
||||
mesh = SubResource("BoxMesh_walkway")
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="WalkA"]
|
||||
mesh = SubResource("BoxMesh_walk20")
|
||||
|
||||
[node name="Walk1b" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -20.5)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Walk1b"]
|
||||
shape = SubResource("BoxShape3D_walkway")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="Walk1b"]
|
||||
mesh = SubResource("BoxMesh_walkway")
|
||||
|
||||
[node name="RailWest" type="StaticBody3D" parent="."]
|
||||
[node name="RailA1" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.15, 0.5, -7)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="RailWest"]
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="RailA1"]
|
||||
shape = SubResource("BoxShape3D_rail")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="RailWest"]
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="RailA1"]
|
||||
mesh = SubResource("BoxMesh_rail")
|
||||
|
||||
[node name="RailEast" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.15, 0.5, -11)
|
||||
[node name="RailA2" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.15, 0.5, -12)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="RailEast"]
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="RailA2"]
|
||||
shape = SubResource("BoxShape3D_rail")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="RailEast"]
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="RailA2"]
|
||||
mesh = SubResource("BoxMesh_rail")
|
||||
|
||||
[node name="ClimbWall" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -26.5)
|
||||
[node name="RailA3" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.15, 0.5, -18)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbWall"]
|
||||
shape = SubResource("BoxShape3D_wall")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="RailA3"]
|
||||
shape = SubResource("BoxShape3D_rail")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbWall"]
|
||||
mesh = SubResource("BoxMesh_wall")
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="RailA3"]
|
||||
mesh = SubResource("BoxMesh_rail")
|
||||
|
||||
[node name="Walk2" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -32.5)
|
||||
[node name="GapB1" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -28)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Walk2"]
|
||||
shape = SubResource("BoxShape3D_walkway")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="GapB1"]
|
||||
shape = SubResource("BoxShape3D_walk8")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="Walk2"]
|
||||
mesh = SubResource("BoxMesh_walkway")
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="GapB1"]
|
||||
mesh = SubResource("BoxMesh_walk8")
|
||||
|
||||
[node name="WidePlatform" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -41.5)
|
||||
[node name="GapB2" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -0.5, -37.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="WidePlatform"]
|
||||
shape = SubResource("BoxShape3D_wide")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="GapB2"]
|
||||
shape = SubResource("BoxShape3D_walk8")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="WidePlatform"]
|
||||
mesh = SubResource("BoxMesh_wide")
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="GapB2"]
|
||||
mesh = SubResource("BoxMesh_walk8")
|
||||
|
||||
[node name="Connector" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -47.5)
|
||||
[node name="GapB3" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -0.5, -46.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Connector"]
|
||||
shape = SubResource("BoxShape3D_connector")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="GapB3"]
|
||||
shape = SubResource("BoxShape3D_walk6")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="Connector"]
|
||||
mesh = SubResource("BoxMesh_connector")
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="GapB3"]
|
||||
mesh = SubResource("BoxMesh_walk6")
|
||||
|
||||
[node name="ClimbWallA" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1, -50.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbWallA"]
|
||||
shape = SubResource("BoxShape3D_wall2")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbWallA"]
|
||||
mesh = SubResource("BoxMesh_wall2")
|
||||
|
||||
[node name="WalkC" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -0.5, -55.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="WalkC"]
|
||||
shape = SubResource("BoxShape3D_walk8")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="WalkC"]
|
||||
mesh = SubResource("BoxMesh_walk8")
|
||||
|
||||
[node name="TransD" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -0.5, -61.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="TransD"]
|
||||
shape = SubResource("BoxShape3D_trans4")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="TransD"]
|
||||
mesh = SubResource("BoxMesh_trans4")
|
||||
|
||||
[node name="LedgeD" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -79.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="LedgeD"]
|
||||
shape = SubResource("BoxShape3D_ledge32")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="LedgeD"]
|
||||
mesh = SubResource("BoxMesh_ledge32")
|
||||
|
||||
[node name="SideWallD" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1.5, -79.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="SideWallD"]
|
||||
shape = SubResource("BoxShape3D_sidewall")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="SideWallD"]
|
||||
mesh = SubResource("BoxMesh_sidewall")
|
||||
|
||||
[node name="NarrowE1" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -104.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="NarrowE1"]
|
||||
shape = SubResource("BoxShape3D_narrow18")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="NarrowE1"]
|
||||
mesh = SubResource("BoxMesh_narrow18")
|
||||
|
||||
[node name="CrossE" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, -0.5, -114.1)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="CrossE"]
|
||||
shape = SubResource("BoxShape3D_cross6")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="CrossE"]
|
||||
mesh = SubResource("BoxMesh_cross6")
|
||||
|
||||
[node name="NarrowE2" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, -0.5, -123.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="NarrowE2"]
|
||||
shape = SubResource("BoxShape3D_narrow18")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="NarrowE2"]
|
||||
mesh = SubResource("BoxMesh_narrow18")
|
||||
|
||||
[node name="RestF" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, -0.5, -135.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="RestF"]
|
||||
shape = SubResource("BoxShape3D_rest46")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="RestF"]
|
||||
mesh = SubResource("BoxMesh_rest46")
|
||||
|
||||
[node name="ClimbWallB" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1, -139.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbWallB"]
|
||||
shape = SubResource("BoxShape3D_wall2")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbWallB"]
|
||||
mesh = SubResource("BoxMesh_wall2")
|
||||
|
||||
[node name="ElevG1" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1, -143.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevG1"]
|
||||
shape = SubResource("BoxShape3D_elev2")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ElevG1"]
|
||||
mesh = SubResource("BoxMesh_elev2")
|
||||
|
||||
[node name="ClimbWallC" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 3, -147.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ClimbWallC"]
|
||||
shape = SubResource("BoxShape3D_wall2")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ClimbWallC"]
|
||||
mesh = SubResource("BoxMesh_wall2")
|
||||
|
||||
[node name="ElevG2" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 2, -151.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ElevG2"]
|
||||
shape = SubResource("BoxShape3D_elev4")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ElevG2"]
|
||||
mesh = SubResource("BoxMesh_elev4")
|
||||
|
||||
[node name="LandingG" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, -0.5, -158.6)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="LandingG"]
|
||||
shape = SubResource("BoxShape3D_walk8")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="LandingG"]
|
||||
mesh = SubResource("BoxMesh_walk8")
|
||||
|
||||
[node name="IslandH1" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, -0.5, -165.1)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="IslandH1"]
|
||||
shape = SubResource("BoxShape3D_island")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="IslandH1"]
|
||||
mesh = SubResource("BoxMesh_island")
|
||||
|
||||
[node name="IslandH2" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.5, -0.5, -169.1)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="IslandH2"]
|
||||
shape = SubResource("BoxShape3D_island")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="IslandH2"]
|
||||
mesh = SubResource("BoxMesh_island")
|
||||
|
||||
[node name="WalkH" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, -0.5, -175.1)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="WalkH"]
|
||||
shape = SubResource("BoxShape3D_walk8")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="WalkH"]
|
||||
mesh = SubResource("BoxMesh_walk8")
|
||||
|
||||
[node name="WideI" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, -0.5, -193.1)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="WideI"]
|
||||
shape = SubResource("BoxShape3D_wide28")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="WideI"]
|
||||
mesh = SubResource("BoxMesh_wide28")
|
||||
|
||||
[node name="ConnJ" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, -0.5, -209.1)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ConnJ"]
|
||||
shape = SubResource("BoxShape3D_conn4")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="ConnJ"]
|
||||
mesh = SubResource("BoxMesh_conn4")
|
||||
|
||||
[node name="EndPlatform" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, -52.5)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, -0.5, -215.1)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="EndPlatform"]
|
||||
shape = SubResource("BoxShape3D_platform")
|
||||
shape = SubResource("BoxShape3D_platform8")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="EndPlatform"]
|
||||
mesh = SubResource("BoxMesh_platform")
|
||||
mesh = SubResource("BoxMesh_platform8")
|
||||
|
||||
[node name="Wren" type="StaticBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.9, 0, -42)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0, -184)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Wren"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
|
||||
|
|
@ -227,7 +463,7 @@ collision_mask = 2
|
|||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="Checkpoint2" type="Area3D" parent="Checkpoints"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -24)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -25)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
|
|
@ -235,23 +471,55 @@ collision_mask = 2
|
|||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="Checkpoint3" type="Area3D" parent="Checkpoints"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -37)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1, -48)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint3"]
|
||||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="WrenTrigger" type="Area3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, -40)
|
||||
[node name="Checkpoint4" type="Area3D" parent="Checkpoints"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, -62)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="WrenTrigger"]
|
||||
shape = SubResource("BoxShape3D_wren_trigger")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint4"]
|
||||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="Checkpoint5" type="Area3D" parent="Checkpoints"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -97)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint5"]
|
||||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="Checkpoint6" type="Area3D" parent="Checkpoints"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1, -134)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint6"]
|
||||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="Checkpoint7" type="Area3D" parent="Checkpoints"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1, -157)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint7"]
|
||||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="Checkpoint8" type="Area3D" parent="Checkpoints"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 1, -181)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Checkpoints/Checkpoint8"]
|
||||
shape = SubResource("BoxShape3D_checkpoint")
|
||||
|
||||
[node name="KillZone" type="Area3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, -26)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -10, -108)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
|
|
@ -259,7 +527,7 @@ collision_mask = 2
|
|||
shape = SubResource("BoxShape3D_killzone")
|
||||
|
||||
[node name="EndTrigger" type="Area3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -53.5)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 1, -216)
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
script = ExtResource("4_zone")
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@ extends Node
|
|||
## Wren-Moment am Viadukt) sind nicht abbrechbar: Der Spieler muss eine
|
||||
## Option wählen, bevor die Szene fortschreitet. Options-Tag story_flag
|
||||
## (Flag-Name -> Wert) schreibt Story-Flags in den GameState (z. B. WIE
|
||||
## Wren gerettet wurde). Der Anzeigename des Spielers in der Box kommt
|
||||
## aus GameState.player_name (Charakter-Anlage). Abgebrochene Dialoge gelten nur dann als geführt, wenn in diesem
|
||||
## Wren gerettet wurde). Abgebrochene Dialoge gelten nur dann als geführt, wenn in diesem
|
||||
## Durchlauf bereits Options-Effekte angewendet wurden — so bleibt der
|
||||
## Erst-Durchlauf-Effekt erhalten, ohne dass Abbrechen zum Werte-Farming
|
||||
## taugt. dialogue_started/dialogue_finished erlauben es, Spielerbewegung
|
||||
|
|
@ -240,12 +239,9 @@ func _bubble_for(speaker_id: String) -> Node:
|
|||
return bubble
|
||||
|
||||
|
||||
## Liefert den Anzeigenamen eines Sprechers: für den Spieler den in der
|
||||
## Charakter-Anlage gewählten Namen, sonst den Eintrag aus der
|
||||
## speakers-Map der Dialog-Datei bzw. die großgeschriebene Sprecher-ID.
|
||||
## Liefert den Anzeigenamen eines Sprechers aus der speakers-Map der
|
||||
## Dialog-Datei, sonst die großgeschriebene Sprecher-ID.
|
||||
func _display_name(speaker_id: String) -> String:
|
||||
if speaker_id == PLAYER_SPEAKER_ID:
|
||||
return GameState.player_name
|
||||
return str(_speaker_names.get(speaker_id, speaker_id.capitalize()))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@ const HUMANITY_MAX := 100
|
|||
const DEFAULT_STRENGTH := 35
|
||||
const DEFAULT_AGILITY := 35
|
||||
const DEFAULT_INTELLECT := 15
|
||||
const DEFAULT_PLAYER_NAME := "Tyrveil"
|
||||
|
||||
var player_name := DEFAULT_PLAYER_NAME
|
||||
var strength := DEFAULT_STRENGTH
|
||||
var agility := DEFAULT_AGILITY
|
||||
var intellect := DEFAULT_INTELLECT
|
||||
|
|
@ -39,7 +37,6 @@ var is_permadeath_enabled := true
|
|||
|
||||
## Setzt alle Werte auf die Startwerte eines neuen Spiels zurück.
|
||||
func reset() -> void:
|
||||
player_name = DEFAULT_PLAYER_NAME
|
||||
strength = DEFAULT_STRENGTH
|
||||
agility = DEFAULT_AGILITY
|
||||
intellect = DEFAULT_INTELLECT
|
||||
|
|
@ -130,7 +127,6 @@ func get_story_flag(flag_name: String, default: Variant = null) -> Variant:
|
|||
## Serialisiert den kompletten Zustand als Dictionary für das SaveSystem.
|
||||
func to_save_dict() -> Dictionary:
|
||||
return {
|
||||
"player_name": player_name,
|
||||
"strength": strength,
|
||||
"agility": agility,
|
||||
"intellect": intellect,
|
||||
|
|
@ -148,9 +144,6 @@ func to_save_dict() -> Dictionary:
|
|||
## normalisiert und alle Werte geklemmt; Änderungs-Signale werden nach dem
|
||||
## Laden ausgelöst.
|
||||
func apply_save_dict(data: Dictionary) -> void:
|
||||
player_name = str(data.get("player_name", DEFAULT_PLAYER_NAME))
|
||||
if player_name.strip_edges().is_empty():
|
||||
player_name = DEFAULT_PLAYER_NAME
|
||||
strength = clampi(int(data.get("strength", DEFAULT_STRENGTH)), STAT_MIN, STAT_MAX)
|
||||
agility = clampi(int(data.get("agility", DEFAULT_AGILITY)), STAT_MIN, STAT_MAX)
|
||||
intellect = clampi(int(data.get("intellect", DEFAULT_INTELLECT)), STAT_MIN, STAT_MAX)
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ func _unhandled_input(event: InputEvent) -> void:
|
|||
_target_zoom = clampf(_target_zoom - ZOOM_STEP, ZOOM_MIN, ZOOM_MAX)
|
||||
elif event.is_action("camera_zoom_out"):
|
||||
_target_zoom = clampf(_target_zoom + ZOOM_STEP, ZOOM_MIN, ZOOM_MAX)
|
||||
elif Input.get_mouse_mode() != Input.MOUSE_MODE_CAPTURED:
|
||||
elif Input.get_mouse_mode() != Input.MOUSE_MODE_CAPTURED and not _is_dialogue_locked:
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||
elif event.is_action_pressed("cancel"):
|
||||
if not _is_dialogue_locked:
|
||||
|
|
@ -153,17 +153,21 @@ func play_camera_pan(duration := PAN_DURATION) -> void:
|
|||
_is_dialogue_locked = false
|
||||
|
||||
|
||||
## Sperrt Bewegung und Look bei Dialogbeginn; ein laufender Slide endet
|
||||
## sauber, damit die Kapsel nicht geduckt stehen bleibt.
|
||||
## Sperrt Bewegung und Look bei Dialogbeginn und gibt die Maus frei,
|
||||
## damit die Antwortauswahl auch per Klick bedienbar ist; ein laufender
|
||||
## Slide endet sauber, damit die Kapsel nicht geduckt stehen bleibt.
|
||||
func _on_dialogue_started(_dialogue_id: String) -> void:
|
||||
if _state == MovementState.SLIDING:
|
||||
_end_slide()
|
||||
_is_dialogue_locked = true
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||
|
||||
|
||||
## Gibt Bewegung und Look nach Dialogende wieder frei.
|
||||
## Gibt Bewegung und Look nach Dialogende wieder frei und fängt die Maus
|
||||
## wieder ein.
|
||||
func _on_dialogue_finished(_dialogue_id: String) -> void:
|
||||
_is_dialogue_locked = false
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||
|
||||
|
||||
## Liefert die aktuelle Kamera-Distanz in Metern für das Debug-Overlay.
|
||||
|
|
|
|||
|
|
@ -1,39 +1,61 @@
|
|||
extends Node3D
|
||||
## Ablauf-Steuerung des Viadukt-Set-Pieces (Phase 3, STORY.md Prolog).
|
||||
## Ablauf-Steuerung des Viadukt-Set-Pieces (Phase 3 + Change Requests,
|
||||
## STORY.md Prolog).
|
||||
##
|
||||
## Spielt beim Betreten den cineastischen Kamera-Schwenk (SPEC Abschnitt
|
||||
## 2), verwaltet die Checkpoints der Segmente und die KillZone unter dem
|
||||
## Steg: Bei Permadeath AN führt ein Sturz zum Game Over (zurück ins
|
||||
## 2), verwaltet die Segment-Checkpoints und die KillZone unter dem Steg:
|
||||
## Bei Permadeath AN führt ein Sturz zum Game Over (zurück ins
|
||||
## Hauptmenü), bei Permadeath AUS zum Respawn am zuletzt erreichten
|
||||
## Segment-Anfang. Der Wren-Moment (Segment 3) startet einmalig beim
|
||||
## Betreten des Trigger-Bereichs als nicht abbrechbarer Dialog
|
||||
## (viaduct_wren.json) — beide Optionen retten Wren, die Wahl landet als
|
||||
## Story-Flag im GameState. Der Übergang am Ende ist ein Platzhalter
|
||||
## Richtung Reiterquadrant; Ankunft und Squad-Logik folgen später.
|
||||
## Checkpoint. Wren läuft vor dem Spieler das Viadukt entlang und bleibt
|
||||
## an der kippenden Platte stehen; holt Tyrveil ihn ein
|
||||
## (WREN_TRIGGER_DISTANCE), löst das Straucheln als nicht abbrechbarer
|
||||
## Dialog aus (viaduct_wren.json) — beide Optionen retten Wren, die Wahl
|
||||
## landet als Story-Flag im GameState. Der Übergang am Ende ist ein
|
||||
## Platzhalter Richtung Reiterquadrant.
|
||||
|
||||
const MAIN_MENU_SCENE := "res://scenes/ui/main_menu.tscn"
|
||||
const WREN_DIALOGUE_PATH := "res://data/dialogue/viaduct_wren.json"
|
||||
const WREN_WALK_SPEED := 1.2
|
||||
const WREN_STALL_Z := -202.0
|
||||
const WREN_TRIGGER_DISTANCE := 3.5
|
||||
|
||||
var _checkpoint_position := Vector3.ZERO
|
||||
var _has_wren_triggered := false
|
||||
var _player: CharacterBody3D
|
||||
|
||||
@onready var _wren: Node3D = $Wren
|
||||
|
||||
|
||||
## Merkt den Startpunkt als ersten Checkpoint, verbindet Checkpoints,
|
||||
## KillZone und Wren-Trigger und spielt den Kamera-Schwenk.
|
||||
## Merkt den Startpunkt als ersten Checkpoint, verbindet Checkpoints und
|
||||
## KillZone und spielt den Kamera-Schwenk.
|
||||
func _ready() -> void:
|
||||
var player := get_tree().get_first_node_in_group("player")
|
||||
if player != null:
|
||||
_checkpoint_position = player.global_position
|
||||
player.play_camera_pan()
|
||||
_player = get_tree().get_first_node_in_group("player")
|
||||
if _player != null:
|
||||
_checkpoint_position = _player.global_position
|
||||
_player.play_camera_pan()
|
||||
for checkpoint in $Checkpoints.get_children():
|
||||
checkpoint.body_entered.connect(_on_checkpoint_entered.bind(checkpoint))
|
||||
$KillZone.body_entered.connect(_on_kill_zone_entered)
|
||||
$WrenTrigger.body_entered.connect(_on_wren_trigger_entered)
|
||||
|
||||
|
||||
## Setzt den Respawn-Punkt auf den erreichten Segment-Anfang.
|
||||
## Lässt Wren das Viadukt entlanggehen, bis er an der kippenden Platte
|
||||
## stehen bleibt, und löst das Straucheln aus, sobald Tyrveil ihn einholt.
|
||||
func _physics_process(delta: float) -> void:
|
||||
if _has_wren_triggered or _player == null:
|
||||
return
|
||||
if _wren.global_position.z > WREN_STALL_Z:
|
||||
_wren.global_position.z -= WREN_WALK_SPEED * delta
|
||||
if DialogueSystem.is_dialogue_active:
|
||||
return
|
||||
if _player.global_position.distance_to(_wren.global_position) <= WREN_TRIGGER_DISTANCE:
|
||||
_has_wren_triggered = true
|
||||
DialogueSystem.start_dialogue(WREN_DIALOGUE_PATH, {
|
||||
"wren": _wren,
|
||||
DialogueSystem.PLAYER_SPEAKER_ID: _player,
|
||||
})
|
||||
|
||||
|
||||
## Setzt den Respawn-Punkt auf den erreichten Segment-Checkpoint.
|
||||
func _on_checkpoint_entered(body: Node3D, checkpoint: Area3D) -> void:
|
||||
if not body.is_in_group("player"):
|
||||
return
|
||||
|
|
@ -52,16 +74,3 @@ func _on_kill_zone_entered(body: Node3D) -> void:
|
|||
return
|
||||
body.velocity = Vector3.ZERO
|
||||
body.global_position = _checkpoint_position
|
||||
|
||||
|
||||
## Startet den Wren-Moment einmalig als nicht abbrechbaren Dialog.
|
||||
func _on_wren_trigger_entered(body: Node3D) -> void:
|
||||
if not body.is_in_group("player"):
|
||||
return
|
||||
if _has_wren_triggered or DialogueSystem.is_dialogue_active:
|
||||
return
|
||||
_has_wren_triggered = true
|
||||
DialogueSystem.start_dialogue(WREN_DIALOGUE_PATH, {
|
||||
"wren": _wren,
|
||||
DialogueSystem.PLAYER_SPEAKER_ID: body,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
extends Control
|
||||
## Charakter-Anlage (Phase 3): Eingabe von Tyrveils Anzeigenamen, wird
|
||||
## nach "Neues Spiel" vor dem Viadukt-Prolog aufgerufen.
|
||||
##
|
||||
## Tastatur: Name direkt eintippen, Enter bestätigt. Controller:
|
||||
## Fokus-Navigation (D-Pad/Stick) plus confirm bestätigt den eingegebenen
|
||||
## bzw. Default-Namen, cancel führt zurück ins Hauptmenü. Auf eine
|
||||
## virtuelle Controller-Tastatur wird bewusst verzichtet: Godots
|
||||
## eingebaute Bildschirmtastatur existiert nur auf Mobile/Web, eine
|
||||
## eigene wäre für den Vertical Slice unverhältnismäßig — der
|
||||
## Tastatur-Fallback mit bestätigbarem Default-Namen deckt beide
|
||||
## Eingabewege ab. Der Name landet in GameState.player_name und erscheint
|
||||
## u. a. in der Dialog-Box.
|
||||
|
||||
const VIADUCT_SCENE := "res://scenes/viaduct/viaduct.tscn"
|
||||
const MAIN_MENU_SCENE := "res://scenes/ui/main_menu.tscn"
|
||||
|
||||
var _is_leaving := false
|
||||
|
||||
@onready var _name_edit: LineEdit = $CenterContainer/VBoxContainer/NameEdit
|
||||
@onready var _confirm_button: Button = $CenterContainer/VBoxContainer/Buttons/ConfirmButton
|
||||
@onready var _back_button: Button = $CenterContainer/VBoxContainer/Buttons/BackButton
|
||||
|
||||
|
||||
## Gibt die Maus frei, füllt den Default-Namen ein und setzt den Fokus in
|
||||
## das Eingabefeld.
|
||||
func _ready() -> void:
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||
_name_edit.text = GameState.DEFAULT_PLAYER_NAME
|
||||
_name_edit.caret_column = _name_edit.text.length()
|
||||
_name_edit.text_submitted.connect(_on_name_submitted)
|
||||
_confirm_button.pressed.connect(_on_confirm_pressed)
|
||||
_back_button.pressed.connect(_on_back_pressed)
|
||||
_name_edit.grab_focus.call_deferred()
|
||||
|
||||
|
||||
## Controller-Bestätigung (Ⓐ/✕) übernimmt den Namen bzw. aktiviert den
|
||||
## fokussierten Button; cancel führt zurück ins Hauptmenü. Enter läuft
|
||||
## über LineEdit (text_submitted) bzw. ui_accept der Buttons.
|
||||
func _unhandled_input(event: InputEvent) -> void:
|
||||
if _is_leaving:
|
||||
return
|
||||
if event.is_action_pressed("cancel"):
|
||||
_on_back_pressed()
|
||||
return
|
||||
if not event.is_action_pressed("confirm"):
|
||||
return
|
||||
if event.is_action("ui_accept"):
|
||||
return
|
||||
var focused := get_viewport().gui_get_focus_owner()
|
||||
if focused == _back_button:
|
||||
_on_back_pressed()
|
||||
else:
|
||||
_on_confirm_pressed()
|
||||
|
||||
|
||||
## Enter im Eingabefeld bestätigt den Namen.
|
||||
func _on_name_submitted(_text: String) -> void:
|
||||
_on_confirm_pressed()
|
||||
|
||||
|
||||
## Übernimmt den Namen (leer -> Default) und startet das Viadukt.
|
||||
func _on_confirm_pressed() -> void:
|
||||
if _is_leaving:
|
||||
return
|
||||
_is_leaving = true
|
||||
var chosen := _name_edit.text.strip_edges()
|
||||
GameState.player_name = chosen if not chosen.is_empty() else GameState.DEFAULT_PLAYER_NAME
|
||||
get_tree().change_scene_to_file(VIADUCT_SCENE)
|
||||
|
||||
|
||||
## Zurück ins Hauptmenü, ohne den GameState anzufassen.
|
||||
func _on_back_pressed() -> void:
|
||||
if _is_leaving:
|
||||
return
|
||||
_is_leaving = true
|
||||
get_tree().change_scene_to_file(MAIN_MENU_SCENE)
|
||||
|
|
@ -1 +0,0 @@
|
|||
uid://bxcrf1rspx0he
|
||||
|
|
@ -18,6 +18,7 @@ const ABORT_INDEX := -1
|
|||
@onready var _speaker_label: Label = $Root/Panel/Margin/Content/SpeakerLabel
|
||||
@onready var _line_label: Label = $Root/Panel/Margin/Content/LineLabel
|
||||
@onready var _options_box: VBoxContainer = $Root/Panel/Margin/Content/OptionsBox
|
||||
@onready var _abort_hint: Label = $Root/Panel/Margin/Content/AbortHint
|
||||
|
||||
|
||||
## Startet unsichtbar; sichtbar wird die Box über show_line().
|
||||
|
|
@ -26,11 +27,13 @@ func _ready() -> void:
|
|||
|
||||
|
||||
## Zeigt eine Dialog-Zeile mit Sprechernamen; eine noch offene
|
||||
## Antwortauswahl wird dabei geleert.
|
||||
## Antwortauswahl wird dabei geleert. Der Abbruch-Hinweis erscheint nur,
|
||||
## wenn der laufende Dialog abbrechbar ist.
|
||||
func show_line(speaker_name: String, text: String) -> void:
|
||||
_speaker_label.text = speaker_name
|
||||
_line_label.text = text
|
||||
_clear_options()
|
||||
_abort_hint.visible = DialogueSystem.is_abort_allowed
|
||||
visible = true
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ extends Control
|
|||
## auf den Beenden-Button. Die Aktivierung läuft explizit über die
|
||||
## Input-Map-Action confirm und hängt nicht an Godots internem ui_accept.
|
||||
|
||||
const CREATION_SCENE := "res://scenes/ui/character_creation.tscn"
|
||||
const NEW_GAME_SCENE := "res://scenes/viaduct/viaduct.tscn"
|
||||
const CONTINUE_SCENE := "res://scenes/hub/rider_quadrant.tscn"
|
||||
|
||||
@onready var _start_button: Button = $CenterContainer/VBoxContainer/StartButton
|
||||
|
|
@ -57,11 +57,12 @@ func _handle_confirm(event: InputEvent) -> void:
|
|||
|
||||
|
||||
## Startet ein neues Spiel mit frisch zurückgesetztem GameState und
|
||||
## Tageszyklus: erst Charakter-Anlage, von dort geht es aufs Viadukt.
|
||||
## Tageszyklus direkt auf dem Viadukt — der Protagonist ist Tyrveil,
|
||||
## eine Umbenennung gibt es bewusst nicht (Change Request).
|
||||
func _on_start_pressed() -> void:
|
||||
GameState.reset()
|
||||
TimeSystem.reset()
|
||||
get_tree().change_scene_to_file(CREATION_SCENE)
|
||||
get_tree().change_scene_to_file(NEW_GAME_SCENE)
|
||||
|
||||
|
||||
## Lädt den Spielstand und wechselt bei Erfolg in den Reiterquadranten.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue