Phase 4b: Zeit-Persistenz, Maren, Sparring, Jack-Barlowe-QTE

- Tag/Slot/Slot-Verbrauch reisen im GameState-Save mit
  (TimeSystem.apply_save_state, gleiche Muster wie story_flags)
- Maren Vael als fuenfter Hub-NPC (grau-blaue Kapsel, Wegpunkte, Wander-KI
  und Ambient wie die anderen; zwei neue Ambient-Wechsel Maren/Wren und
  Maren/Imogen); maren_intro.json: ruhig, warm, wissend, Vater-Andeutungen
  ohne Wahrheit-1/2-Vorwegnahme, Entscheidungspunkt Klinge/Herz/neutral
- Sparring-Ring im Reiterquadranten: Slot-Verbrauch, Stat-Check gegen
  Zweitjahr (Sieg bei Kraft>=40 ODER Schnelligkeit>=40; Startwerte 35/35
  verlieren erst), Sieg-/Niederlage-Dialoge mit taktischem
  Klinge/Herz-Punkt; neues faction_standing-Options-Tag im DialogueSystem
  als erster Story-Verbraucher des FactionSystems (Ton -5/+5 bzw. -3/+3,
  Standing +3/+2 Sieg, +1 Niederlage)
- Jack-Barlowe-Hinterhalt (Kanon: WELT.md 8; Auflauern auf Tyrveil ist die
  SPEC-10-Spiel-Setzung): ab Tag 2 pro Slot-Wechsel 50% Chance, max. 1x
  taeglich; nicht abbrechbarer Droh-Dialog, dann 3 QTE-Stufen ueber
  slide/jump/sprint (Tastatur+Controller, 1,4-s-Fenster, uebriger Input
  wird waehrenddessen geschluckt); Erfolg -> Wahl-Dialog (Standing +3/+2,
  Ton -5/+5), Fehlschlag: Permadeath AN Game Over, AUS Standing -3;
  player.set_control_locked() als oeffentliche Sperre fuer die QTE-Phase
- Headless verifiziert (43 Checks): Zeit-Roundtrip, Maren-Werte, Sparring
  beide Ausgaenge und Wege inkl. Slots, QTE Erfolg/Fehlschlag AUS/AN

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
danny 2026-07-06 06:36:00 +02:00
parent ef60c96735
commit 5eb46577b9
18 changed files with 651 additions and 3 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=40 format=3]
[gd_scene load_steps=48 format=3]
[ext_resource type="Script" path="res://scripts/gameplay/hub_room.gd" id="1_room"]
[ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"]
@ -8,6 +8,8 @@
[ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="6_bubble"]
[ext_resource type="Script" path="res://scripts/gameplay/ambient_chatter.gd" id="7_chatter"]
[ext_resource type="Script" path="res://scripts/gameplay/training_station.gd" id="8_station"]
[ext_resource type="Script" path="res://scripts/gameplay/sparring_station.gd" id="9_sparring"]
[ext_resource type="Script" path="res://scripts/gameplay/jack_ambush.gd" id="10_jack"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"]
sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
@ -87,6 +89,14 @@ material = SubResource("StandardMaterial3D_wren")
radius = 0.4
height = 1.8
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_maren"]
albedo_color = Color(0.55, 0.6, 0.75, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_maren"]
material = SubResource("StandardMaterial3D_maren")
radius = 0.4
height = 1.8
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_npc"]
radius = 0.4
height = 1.8
@ -111,6 +121,21 @@ albedo_color = Color(0.3, 0.6, 0.6, 1)
material = SubResource("StandardMaterial3D_navigation")
size = Vector3(1.2, 1.2, 1.2)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sparring"]
albedo_color = Color(0.5, 0.35, 0.35, 1)
[sub_resource type="BoxMesh" id="BoxMesh_sparring"]
material = SubResource("StandardMaterial3D_sparring")
size = Vector3(1.2, 1.2, 1.2)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jack"]
albedo_color = Color(0.35, 0.18, 0.18, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_jack"]
material = SubResource("StandardMaterial3D_jack")
radius = 0.4
height = 1.8
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_trigger"]
transparency = 1
albedo_color = Color(0.3, 0.8, 1, 0.35)
@ -370,6 +395,49 @@ shape = SubResource("SphereShape3D_interact")
[node name="SpeechBubble" parent="Wren" instance=ExtResource("6_bubble")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8, 0)
[node name="Maren" type="CharacterBody3D" parent="." groups=["npc"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 0, -4)
collision_mask = 3
script = ExtResource("4_imogen")
npc_id = "maren"
dialogue_path = "res://data/dialogue/maren_intro.json"
waypoint_paths = Array[NodePath]([NodePath("../NpcWaypoints/MarenA"), NodePath("../NpcWaypoints/MarenB"), NodePath("../NpcWaypoints/MarenC")])
[node name="CollisionShape3D" type="CollisionShape3D" parent="Maren"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
shape = SubResource("CapsuleShape3D_npc")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Maren"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
mesh = SubResource("CapsuleMesh_maren")
[node name="NameLabel" type="Label3D" parent="Maren"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.2, 0)
billboard = 1
text = "Maren"
font_size = 64
outline_size = 16
[node name="PromptLabel" type="Label3D" parent="Maren"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0)
visible = false
modulate = Color(1, 0.9, 0.5, 1)
billboard = 1
text = "E / (A) — Reden"
font_size = 40
outline_size = 12
[node name="InteractionArea" type="Area3D" parent="Maren"]
collision_layer = 0
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="Maren/InteractionArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("SphereShape3D_interact")
[node name="SpeechBubble" parent="Maren" instance=ExtResource("6_bubble")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8, 0)
[node name="Triggers" type="Node3D" parent="."]
[node name="TriggerDormitory" type="Area3D" parent="Triggers"]
@ -460,6 +528,15 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0, -8)
[node name="WrenC" type="Marker3D" parent="NpcWaypoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, -10)
[node name="MarenA" type="Marker3D" parent="NpcWaypoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 0, -4)
[node name="MarenB" type="Marker3D" parent="NpcWaypoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0, -12)
[node name="MarenC" type="Marker3D" parent="NpcWaypoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -8)
[node name="AmbientChatter" type="Node" parent="."]
script = ExtResource("7_chatter")
@ -547,6 +624,71 @@ shape = SubResource("SphereShape3D_interact")
[node name="SpeechBubble" parent="NavigationStation" instance=ExtResource("6_bubble")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.6, 0)
[node name="SparringStation" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16, 0, 2)
script = ExtResource("9_sparring")
[node name="CollisionShape3D" type="CollisionShape3D" parent="SparringStation"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
shape = SubResource("BoxShape3D_station")
[node name="MeshInstance3D" type="MeshInstance3D" parent="SparringStation"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
mesh = SubResource("BoxMesh_sparring")
[node name="NameLabel" type="Label3D" parent="SparringStation"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
billboard = 1
text = "Sparring-Ring"
font_size = 56
outline_size = 14
[node name="PromptLabel" type="Label3D" parent="SparringStation"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
visible = false
modulate = Color(1, 0.9, 0.5, 1)
billboard = 1
text = "E / (A) — Sparring"
font_size = 40
outline_size = 12
[node name="InteractionArea" type="Area3D" parent="SparringStation"]
collision_layer = 0
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="SparringStation/InteractionArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("SphereShape3D_interact")
[node name="SpeechBubble" parent="SparringStation" instance=ExtResource("6_bubble")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.6, 0)
[node name="Jack" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -50, 0)
visible = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="Jack"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
shape = SubResource("CapsuleShape3D_npc")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Jack"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
mesh = SubResource("CapsuleMesh_jack")
[node name="NameLabel" type="Label3D" parent="Jack"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.2, 0)
billboard = 1
text = "Jack Barlowe"
font_size = 64
outline_size = 16
[node name="SpeechBubble" parent="Jack" instance=ExtResource("6_bubble")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.8, 0)
[node name="JackAmbush" type="Node" parent="."]
script = ExtResource("10_jack")
jack_path = NodePath("../Jack")
[node name="Player" parent="." instance=ExtResource("2_player")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 8)