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:
parent
ef60c96735
commit
5eb46577b9
18 changed files with 651 additions and 3 deletions
|
|
@ -35,6 +35,20 @@
|
|||
{ "speaker": "violet", "text": "Sie riechen alles. Aber Angst heißt nur, dass du begriffen hast, wo du bist. Das ist ein Anfang." }
|
||||
]
|
||||
},
|
||||
{
|
||||
"npcs": ["maren", "wren"],
|
||||
"lines": [
|
||||
{ "speaker": "maren", "text": "Calloran. Schultern runter. Die Ohren dürfen trotzdem oben bleiben." },
|
||||
{ "speaker": "wren", "text": "S-so? ... Oh. Das ist tatsächlich besser. Danke!" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"npcs": ["maren", "imogen"],
|
||||
"lines": [
|
||||
{ "speaker": "imogen", "text": "Du wachst schon wieder über den Hof, Vael. Schlafen Drittjahre eigentlich nie?" },
|
||||
{ "speaker": "maren", "text": "Doch. Im Stehen, mit einem Auge. Das andere hat euch gern im Blick." }
|
||||
]
|
||||
},
|
||||
{
|
||||
"npcs": ["imogen", "rhiannon"],
|
||||
"lines": [
|
||||
|
|
|
|||
16
data/dialogue/jack_fail.json
Normal file
16
data/dialogue/jack_fail.json
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"id": "jack_fail",
|
||||
"start": "gloat",
|
||||
"can_abort": false,
|
||||
"speakers": {
|
||||
"jack": "Jack Barlowe",
|
||||
"player": "Tyrveil"
|
||||
},
|
||||
"nodes": {
|
||||
"gloat": {
|
||||
"speaker": "jack",
|
||||
"text": "Der Boden ist euer Zuhause, Gezeichneter. Merk dir das Gefühl — und bedank dich bei den Zeugen, dass es dabei bleibt.",
|
||||
"next": null
|
||||
}
|
||||
}
|
||||
}
|
||||
16
data/dialogue/jack_intro.json
Normal file
16
data/dialogue/jack_intro.json
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"id": "jack_intro",
|
||||
"start": "threat",
|
||||
"can_abort": false,
|
||||
"speakers": {
|
||||
"jack": "Jack Barlowe",
|
||||
"player": "Tyrveil"
|
||||
},
|
||||
"nodes": {
|
||||
"threat": {
|
||||
"speaker": "jack",
|
||||
"text": "Ein Gezeichneter. Allein im Hof. Wisst ihr nicht, dass man Unfälle hier nicht einmal melden muss? Halt still, Rowyth — dann geht es schnell.",
|
||||
"next": null
|
||||
}
|
||||
}
|
||||
}
|
||||
39
data/dialogue/jack_win.json
Normal file
39
data/dialogue/jack_win.json
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
"id": "jack_win",
|
||||
"start": "beaten",
|
||||
"can_abort": false,
|
||||
"speakers": {
|
||||
"jack": "Jack Barlowe",
|
||||
"player": "Tyrveil"
|
||||
},
|
||||
"nodes": {
|
||||
"beaten": {
|
||||
"speaker": "jack",
|
||||
"text": "Schon gut— schon gut! Verdammte Gezeichneten-Reflexe. Beim nächsten Mal sind wir mehr, Rowyth.",
|
||||
"options": [
|
||||
{
|
||||
"text": "Beim nächsten Mal stehst du nicht wieder auf. Lauf.",
|
||||
"blade_heart": -5,
|
||||
"faction_standing": { "gezeichnete": 3 },
|
||||
"next": "win_blade"
|
||||
},
|
||||
{
|
||||
"text": "Verschwinde, Barlowe. Und lass die Jüngeren in Ruhe — das hier bleibt unter uns.",
|
||||
"blade_heart": 5,
|
||||
"faction_standing": { "gezeichnete": 2 },
|
||||
"next": "win_heart"
|
||||
}
|
||||
]
|
||||
},
|
||||
"win_blade": {
|
||||
"speaker": "jack",
|
||||
"text": "Große Worte für einen mit Brandzeichen. ... Aber heute gehören sie dir.",
|
||||
"next": null
|
||||
},
|
||||
"win_heart": {
|
||||
"speaker": "jack",
|
||||
"text": "Unter uns? Du bist seltsam, Rowyth. Seltsam und zu schnell. Beides merke ich mir.",
|
||||
"next": null
|
||||
}
|
||||
}
|
||||
}
|
||||
58
data/dialogue/maren_intro.json
Normal file
58
data/dialogue/maren_intro.json
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
"id": "maren_intro",
|
||||
"start": "greeting",
|
||||
"abort_lines": [
|
||||
"Später, Vael. Ich habe das Gefühl, du läufst nicht weg.",
|
||||
"Die Pflicht ruft. Aber dieses Gespräch holen wir nach.",
|
||||
"Ich muss weiter. Und irgendwann erzählst du mir, woher du mich so gut kennst."
|
||||
],
|
||||
"speakers": {
|
||||
"maren": "Maren",
|
||||
"player": "Tyrveil"
|
||||
},
|
||||
"nodes": {
|
||||
"greeting": {
|
||||
"speaker": "maren",
|
||||
"text": "Rowyth. Du stehst wie er, weißt du das? Das Gewicht auf dem hinteren Fuß, als könnte jeden Moment etwas kippen.",
|
||||
"options": [
|
||||
{
|
||||
"text": "Du kennst meinen Namen. Ich deinen nicht. Das ist ein Ungleichgewicht.",
|
||||
"blade_heart": -5,
|
||||
"relationship": { "maren": 1 },
|
||||
"next": "blade_reply"
|
||||
},
|
||||
{
|
||||
"text": "Wie wer?",
|
||||
"blade_heart": 5,
|
||||
"relationship": { "maren": 2 },
|
||||
"next": "heart_reply"
|
||||
},
|
||||
{
|
||||
"text": "Solange nichts kippt, soll mir die Haltung recht sein.",
|
||||
"relationship": { "maren": 1 },
|
||||
"next": "neutral_reply"
|
||||
}
|
||||
]
|
||||
},
|
||||
"blade_reply": {
|
||||
"speaker": "maren",
|
||||
"text": "Maren Vael. Drittjahr. Und keine Sorge — was ich weiß, wiegt schwerer als das, was ich sage. Bei mir ist beides sicher.",
|
||||
"next": "closing"
|
||||
},
|
||||
"heart_reply": {
|
||||
"speaker": "maren",
|
||||
"text": "Jemand, mit dem ich Tee getrunken habe, als dein Jahrgang noch Milchzähne hatte. Den Rest erzähle ich dir, wenn du so weit bist. Nicht heute — heute würdest du nur die falschen Fragen stellen.",
|
||||
"next": "closing"
|
||||
},
|
||||
"neutral_reply": {
|
||||
"speaker": "maren",
|
||||
"text": "Gut pariert. Aber das Kippen gehört hier dazu, Rowyth — die Kunst ist, zu wissen, wohin man fällt. Frag mich irgendwann, woher ich das habe.",
|
||||
"next": "closing"
|
||||
},
|
||||
"closing": {
|
||||
"speaker": "maren",
|
||||
"text": "Die Jüngsten schlafen ruhiger, seit du nachts deine Runden gehst. Das hat er auch getan — in einem anderen Leben. Und jetzt geh, bevor ich sentimental werde. Drittjahre weinen nur dienstags.",
|
||||
"next": null
|
||||
}
|
||||
}
|
||||
}
|
||||
42
data/dialogue/sparring_loss.json
Normal file
42
data/dialogue/sparring_loss.json
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"id": "sparring_loss",
|
||||
"start": "downed",
|
||||
"abort_lines": [
|
||||
"Reicht für heute. Der Boden und ich kennen uns jetzt.",
|
||||
"Ein andermal weiter. Ich hab genug gelernt für einen Tag."
|
||||
],
|
||||
"speakers": {
|
||||
"sparring": "Sparringspartner",
|
||||
"player": "Tyrveil"
|
||||
},
|
||||
"nodes": {
|
||||
"downed": {
|
||||
"speaker": "sparring",
|
||||
"text": "Zu direkt, zu viel Kraft aus der Schulter. Du liegst, Rowyth. Aufgeben oder aufstehen?",
|
||||
"options": [
|
||||
{
|
||||
"text": "Nochmal. Sofort.",
|
||||
"blade_heart": -3,
|
||||
"faction_standing": { "gezeichnete": 1 },
|
||||
"next": "loss_blade"
|
||||
},
|
||||
{
|
||||
"text": "Aufstehen. Und du zeigst mir, wie du das gemacht hast.",
|
||||
"blade_heart": 3,
|
||||
"faction_standing": { "gezeichnete": 1 },
|
||||
"next": "loss_heart"
|
||||
}
|
||||
]
|
||||
},
|
||||
"loss_blade": {
|
||||
"speaker": "sparring",
|
||||
"text": "Zäh. Das respektiere ich. Morgen wieder — mit weniger Wut und mehr Fußarbeit, dann wird das gefährlich.",
|
||||
"next": null
|
||||
},
|
||||
"loss_heart": {
|
||||
"speaker": "sparring",
|
||||
"text": "Sieh an, einer, der fragt statt schmollt. Der Trick ist der hintere Fuß. Komm wieder — aus dir wird was.",
|
||||
"next": null
|
||||
}
|
||||
}
|
||||
}
|
||||
42
data/dialogue/sparring_win.json
Normal file
42
data/dialogue/sparring_win.json
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"id": "sparring_win",
|
||||
"start": "downed",
|
||||
"abort_lines": [
|
||||
"Ein andermal zu Ende. Merk dir den Stand.",
|
||||
"Die Pflicht ruft. Der Punkt geht trotzdem an mich."
|
||||
],
|
||||
"speakers": {
|
||||
"sparring": "Sparringspartner",
|
||||
"player": "Tyrveil"
|
||||
},
|
||||
"nodes": {
|
||||
"downed": {
|
||||
"speaker": "sparring",
|
||||
"text": "Nicht schlecht, Rowyth. Du hast mich. Und der halbe Hof schaut zu — wie beenden wir das?",
|
||||
"options": [
|
||||
{
|
||||
"text": "So, dass der halbe Hof sieht, was passiert, wenn man Gezeichnete unterschätzt.",
|
||||
"blade_heart": -5,
|
||||
"faction_standing": { "gezeichnete": 3 },
|
||||
"next": "win_blade"
|
||||
},
|
||||
{
|
||||
"text": "Ich helfe dir auf, wir verbeugen uns beide. Guter Kampf.",
|
||||
"blade_heart": 5,
|
||||
"faction_standing": { "gezeichnete": 2 },
|
||||
"next": "win_heart"
|
||||
}
|
||||
]
|
||||
},
|
||||
"win_blade": {
|
||||
"speaker": "sparring",
|
||||
"text": "Verstanden. Sehr deutlich verstanden. ... Sag deinen Leuten, das mit dem Unterschätzen hat sich erledigt.",
|
||||
"next": null
|
||||
},
|
||||
"win_heart": {
|
||||
"speaker": "sparring",
|
||||
"text": "Du bist anders, als sie über euch reden, Rowyth. Guter Kampf. Morgen Revanche?",
|
||||
"next": null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
> 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.
|
||||
> 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.
|
||||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -198,6 +198,10 @@ func _apply_option_effects(option: Dictionary) -> void:
|
|||
for flag_name in flag_changes:
|
||||
GameState.set_story_flag(str(flag_name), flag_changes[flag_name])
|
||||
_has_applied_effects = true
|
||||
var standing_shifts: Dictionary = option.get("faction_standing", {})
|
||||
for faction_id in standing_shifts:
|
||||
FactionSystem.adjust_standing(str(faction_id), int(standing_shifts[faction_id]))
|
||||
_has_applied_effects = true
|
||||
|
||||
|
||||
## Spielt eine zufällig gewählte Abbruch-Zeile Tyrveils, damit der
|
||||
|
|
|
|||
|
|
@ -160,6 +160,9 @@ func to_save_dict() -> Dictionary:
|
|||
"story_flags": story_flags.duplicate(),
|
||||
"faction_standings": faction_standings.duplicate(),
|
||||
"is_permadeath_enabled": is_permadeath_enabled,
|
||||
"time_day": TimeSystem.day_count,
|
||||
"time_slot": TimeSystem.current_slot,
|
||||
"time_slot_used": TimeSystem.is_current_slot_used,
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -190,6 +193,7 @@ func apply_save_dict(data: Dictionary) -> void:
|
|||
var saved_standings: Dictionary = data.get("faction_standings", {})
|
||||
for faction_id in saved_standings:
|
||||
faction_standings[String(faction_id)] = clampi(int(saved_standings[faction_id]), RELATIONSHIP_MIN, RELATIONSHIP_MAX)
|
||||
TimeSystem.apply_save_state(int(data.get("time_day", 1)), int(data.get("time_slot", 0)), bool(data.get("time_slot_used", false)))
|
||||
blade_heart_tone_changed.emit(blade_heart_tone)
|
||||
for npc_id in relationships:
|
||||
relationship_changed.emit(npc_id, relationships[npc_id])
|
||||
|
|
|
|||
|
|
@ -57,6 +57,15 @@ func advance_slot() -> void:
|
|||
push_warning("advance_slot() am Abend ignoriert — Tag endet nur im Schlafsaal.")
|
||||
|
||||
|
||||
## Stellt Tag, Slot und Slot-Verbrauch aus einem Spielstand wieder her
|
||||
## (aufgerufen von GameState.apply_save_dict, damit der Tageszyklus im
|
||||
## selben Spielstand mitreist). Meldet den Slot über slot_changed.
|
||||
func apply_save_state(saved_day: int, saved_slot: int, is_used: bool) -> void:
|
||||
day_count = maxi(1, saved_day)
|
||||
_change_slot(clampi(saved_slot, DaySlot.MORNING, DaySlot.EVENING) as DaySlot)
|
||||
is_current_slot_used = is_used
|
||||
|
||||
|
||||
## Beendet den Tag über den Schlafsaal-Trigger: erhöht den Tageszähler und
|
||||
## springt zurück auf den Vormittag.
|
||||
func end_day() -> void:
|
||||
|
|
|
|||
173
scripts/gameplay/jack_ambush.gd
Normal file
173
scripts/gameplay/jack_ambush.gd
Normal file
|
|
@ -0,0 +1,173 @@
|
|||
extends Node
|
||||
## Jack-Barlowe-Hinterhalte mit QTE (Phase 4b, SPEC.md Roadmap Phase 4).
|
||||
##
|
||||
## Kanon-Basis WELT.md Abschnitt 8: Jack Barlowe ist Kadett und erklärter
|
||||
## Feind, der wiederholt zu töten versucht; dass er Tyrveil als
|
||||
## Gezeichnetem auflauert, ist die von SPEC vorgesehene Spiel-Setzung.
|
||||
## Kopplung an den Tageszyklus: Ab Tag AMBUSH_MIN_DAY würfelt jeder
|
||||
## Slot-Wechsel mit ambush_chance, höchstens ein Hinterhalt pro Tag.
|
||||
## Ablauf: nicht abbrechbarer Einschüchterungs-Dialog, dann QTE_STAGES
|
||||
## zeitkritische Eingaben über bestehende Input-Actions (slide, jump,
|
||||
## sprint — Tastatur wie Controller identisch); während der QTE ist die
|
||||
## Spieler-Steuerung gesperrt und aller übrige Input wird geschluckt.
|
||||
## Erfolg: Wahl-Dialog Klinge/Herz mit Standing +3/+2. Scheitern: bei
|
||||
## Permadeath AN Game Over ins Hauptmenü (wie am Viadukt), bei Permadeath
|
||||
## AUS Prellungen und Gezeichneten-Standing FAIL_STANDING_PENALTY.
|
||||
|
||||
const INTRO_PATH := "res://data/dialogue/jack_intro.json"
|
||||
const WIN_PATH := "res://data/dialogue/jack_win.json"
|
||||
const FAIL_PATH := "res://data/dialogue/jack_fail.json"
|
||||
const MAIN_MENU_SCENE := "res://scenes/ui/main_menu.tscn"
|
||||
const AMBUSH_MIN_DAY := 2
|
||||
const QTE_STAGES := 3
|
||||
const QTE_WINDOW_SECONDS := 1.4
|
||||
const QTE_STAGE_GAP_SECONDS := 0.3
|
||||
const QTE_ACTIONS := [
|
||||
{ "action": "slide", "label": "AUSWEICHEN — C / L2" },
|
||||
{ "action": "jump", "label": "SPRINGEN — Leertaste / (A)" },
|
||||
{ "action": "sprint", "label": "ANTÄUSCHEN — Shift / L3" },
|
||||
]
|
||||
const FAIL_STANDING_PENALTY := -3
|
||||
const JACK_HIDDEN_POSITION := Vector3(0, -50, 0)
|
||||
|
||||
@export var jack_path: NodePath
|
||||
@export var ambush_chance := 0.5
|
||||
|
||||
var is_ambush_active := false
|
||||
|
||||
var _last_ambush_day := 0
|
||||
var _qte_expected_action := ""
|
||||
var _is_stage_passed := false
|
||||
var _is_stage_failed := false
|
||||
var _qte_layer: CanvasLayer
|
||||
var _qte_label: Label
|
||||
|
||||
@onready var _jack: Node3D = get_node(jack_path)
|
||||
|
||||
|
||||
## Lauscht auf Slot-Wechsel als Hinterhalt-Auslöser.
|
||||
func _ready() -> void:
|
||||
TimeSystem.slot_changed.connect(_on_slot_changed)
|
||||
|
||||
|
||||
## Bewertet die QTE-Eingabe; während einer aktiven QTE wird sämtlicher
|
||||
## übriger Input geschluckt, damit keine NPC-Interaktion dazwischenfunkt.
|
||||
func _unhandled_input(event: InputEvent) -> void:
|
||||
if _qte_expected_action.is_empty():
|
||||
return
|
||||
for stage in QTE_ACTIONS:
|
||||
if event.is_action_pressed(str(stage["action"])):
|
||||
if stage["action"] == _qte_expected_action:
|
||||
_is_stage_passed = true
|
||||
else:
|
||||
_is_stage_failed = true
|
||||
break
|
||||
get_viewport().set_input_as_handled()
|
||||
|
||||
|
||||
## Würfelt beim Slot-Wechsel, ob Jack auflauert.
|
||||
func _on_slot_changed(_new_slot: int) -> void:
|
||||
if is_ambush_active or DialogueSystem.is_dialogue_active:
|
||||
return
|
||||
if TimeSystem.day_count < AMBUSH_MIN_DAY:
|
||||
return
|
||||
if _last_ambush_day == TimeSystem.day_count:
|
||||
return
|
||||
if randf() > ambush_chance:
|
||||
return
|
||||
start_ambush()
|
||||
|
||||
|
||||
## Startet den Hinterhalt: Jack erscheint vor dem Spieler, droht, dann
|
||||
## läuft die QTE. Öffentlich, damit Tests ihn deterministisch auslösen
|
||||
## können.
|
||||
func start_ambush() -> void:
|
||||
if is_ambush_active or DialogueSystem.is_dialogue_active:
|
||||
return
|
||||
var player := get_tree().get_first_node_in_group("player")
|
||||
if player == null:
|
||||
return
|
||||
is_ambush_active = true
|
||||
_last_ambush_day = TimeSystem.day_count
|
||||
_jack.global_position = player.global_position + Vector3(0, 0, -2.5)
|
||||
_jack.visible = true
|
||||
_run_ambush(player)
|
||||
|
||||
|
||||
## Spielt den kompletten Hinterhalt als Coroutine ab.
|
||||
func _run_ambush(player: CharacterBody3D) -> void:
|
||||
DialogueSystem.start_dialogue(INTRO_PATH, {
|
||||
"jack": _jack,
|
||||
DialogueSystem.PLAYER_SPEAKER_ID: player,
|
||||
})
|
||||
await DialogueSystem.dialogue_finished
|
||||
player.set_control_locked(true)
|
||||
var is_success := await _run_qte()
|
||||
player.set_control_locked(false)
|
||||
if is_success:
|
||||
DialogueSystem.start_dialogue(WIN_PATH, {
|
||||
"jack": _jack,
|
||||
DialogueSystem.PLAYER_SPEAKER_ID: player,
|
||||
})
|
||||
await DialogueSystem.dialogue_finished
|
||||
elif GameState.is_permadeath_enabled:
|
||||
print("Game Over — Barlowes Hinterhalt endet tödlich.")
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||
get_tree().change_scene_to_file(MAIN_MENU_SCENE)
|
||||
return
|
||||
else:
|
||||
FactionSystem.adjust_standing(FactionSystem.MARKED_FACTION_ID, FAIL_STANDING_PENALTY)
|
||||
DialogueSystem.start_dialogue(FAIL_PATH, {
|
||||
"jack": _jack,
|
||||
DialogueSystem.PLAYER_SPEAKER_ID: player,
|
||||
})
|
||||
await DialogueSystem.dialogue_finished
|
||||
_jack.visible = false
|
||||
_jack.global_position = JACK_HIDDEN_POSITION
|
||||
is_ambush_active = false
|
||||
|
||||
|
||||
## Führt die QTE-Stufen aus; true, wenn alle bestanden wurden.
|
||||
func _run_qte() -> bool:
|
||||
_ensure_qte_ui()
|
||||
_qte_layer.visible = true
|
||||
var is_all_passed := true
|
||||
for i in QTE_STAGES:
|
||||
var stage: Dictionary = QTE_ACTIONS.pick_random()
|
||||
_is_stage_passed = false
|
||||
_is_stage_failed = false
|
||||
_qte_label.text = str(stage["label"])
|
||||
_qte_expected_action = str(stage["action"])
|
||||
var timer := get_tree().create_timer(QTE_WINDOW_SECONDS)
|
||||
while timer.time_left > 0.0 and not _is_stage_passed and not _is_stage_failed:
|
||||
await get_tree().process_frame
|
||||
_qte_expected_action = ""
|
||||
if not _is_stage_passed:
|
||||
is_all_passed = false
|
||||
break
|
||||
_qte_label.text = "!"
|
||||
await get_tree().create_timer(QTE_STAGE_GAP_SECONDS).timeout
|
||||
_qte_layer.visible = false
|
||||
return is_all_passed
|
||||
|
||||
|
||||
## Baut die QTE-Anzeige (zentriertes Laufzeit-Label) beim ersten Bedarf.
|
||||
func _ensure_qte_ui() -> void:
|
||||
if _qte_layer != null:
|
||||
return
|
||||
_qte_layer = CanvasLayer.new()
|
||||
_qte_layer.layer = 3
|
||||
var root := Control.new()
|
||||
root.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||
root.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||
_qte_label = Label.new()
|
||||
_qte_label.set_anchors_preset(Control.PRESET_CENTER)
|
||||
_qte_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||
_qte_label.add_theme_font_size_override("font_size", 42)
|
||||
_qte_label.add_theme_color_override("font_color", Color(1, 0.85, 0.4))
|
||||
_qte_label.add_theme_color_override("font_outline_color", Color.BLACK)
|
||||
_qte_label.add_theme_constant_override("outline_size", 8)
|
||||
root.add_child(_qte_label)
|
||||
_qte_layer.add_child(root)
|
||||
add_child(_qte_layer)
|
||||
_qte_layer.visible = false
|
||||
1
scripts/gameplay/jack_ambush.gd.uid
Normal file
1
scripts/gameplay/jack_ambush.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://dp2ww21frqcvr
|
||||
|
|
@ -133,6 +133,14 @@ func _process_dialogue_lock(delta: float) -> void:
|
|||
_apply_zoom_smoothing(delta)
|
||||
|
||||
|
||||
## Sperrt oder entsperrt die Steuerung von außen (Set-Pieces und
|
||||
## QTE-Encounter nutzen dieselbe Sperre wie Dialoge).
|
||||
func set_control_locked(is_locked: bool) -> void:
|
||||
if is_locked and _state == MovementState.SLIDING:
|
||||
_end_slide()
|
||||
_is_dialogue_locked = is_locked
|
||||
|
||||
|
||||
## Spielt einen kurzen cineastischen Kamera-Schwenk für Set-Pieces
|
||||
## (SPEC Abschnitt 2): Die Kamera startet weit draußen und seitlich und
|
||||
## fährt weich in die Standard-Third-Person-Ansicht zurück; die Steuerung
|
||||
|
|
|
|||
79
scripts/gameplay/sparring_station.gd
Normal file
79
scripts/gameplay/sparring_station.gd
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
extends StaticBody3D
|
||||
## Sparring-Station im Reiterquadranten (Phase 4b, SPEC.md Roadmap
|
||||
## Phase 4: stat-basiertes, taktisches Sparring).
|
||||
##
|
||||
## Interaktion wie bei den Unterrichts-Stationen; jede Runde verbraucht
|
||||
## einen Tages-Slot (TimeSystem.try_spend_slot). Der Ausgang hängt an
|
||||
## einem Stat-Check gegen einen erfahrenen Zweitjahr-Kadetten: Sieg bei
|
||||
## Kraft >= STRENGTH_THRESHOLD ODER Schnelligkeit >= AGILITY_THRESHOLD
|
||||
## (je 40 — mit den Startwerten 35/35 verliert man zunächst und muss über
|
||||
## das Training aus Phase 4a wachsen). Sieg wie Niederlage laufen als
|
||||
## Dialog mit taktischem Klinge/Herz-Entscheidungspunkt; die Optionen
|
||||
## verschieben Klinge-↔-Herz-Ton und das Gezeichneten-Standing
|
||||
## (faction_standing-Tag, erster Story-Verbraucher des FactionSystems).
|
||||
|
||||
const STRENGTH_THRESHOLD := 40
|
||||
const AGILITY_THRESHOLD := 40
|
||||
const INPUT_COOLDOWN_MS := 800
|
||||
|
||||
@export_file("*.json") var win_dialogue_path := "res://data/dialogue/sparring_win.json"
|
||||
@export_file("*.json") var loss_dialogue_path := "res://data/dialogue/sparring_loss.json"
|
||||
@export var exhausted_line := "Für heute reicht es — der Schlafsaal wartet."
|
||||
|
||||
var _is_player_in_range := false
|
||||
var _last_use_ms := -INPUT_COOLDOWN_MS
|
||||
|
||||
@onready var _prompt_label: Label3D = $PromptLabel
|
||||
@onready var _interaction_area: Area3D = $InteractionArea
|
||||
@onready var _bubble: Node3D = $SpeechBubble
|
||||
|
||||
|
||||
## Verbindet die Reichweiten-Signale des Interaktions-Triggers.
|
||||
func _ready() -> void:
|
||||
_interaction_area.body_entered.connect(_on_body_entered)
|
||||
_interaction_area.body_exited.connect(_on_body_exited)
|
||||
|
||||
|
||||
## Startet die Sparringrunde bei interact in Reichweite, außerhalb
|
||||
## laufender Dialoge und nach Ablauf des Doppel-Eingabe-Schutzes.
|
||||
func _unhandled_input(event: InputEvent) -> void:
|
||||
if not _is_player_in_range:
|
||||
return
|
||||
if DialogueSystem.is_dialogue_active:
|
||||
return
|
||||
if not event.is_action_pressed("interact"):
|
||||
return
|
||||
if Time.get_ticks_msec() - _last_use_ms < INPUT_COOLDOWN_MS:
|
||||
return
|
||||
_last_use_ms = Time.get_ticks_msec()
|
||||
_spar()
|
||||
|
||||
|
||||
## Verbraucht den Tages-Slot und startet je nach Stat-Check den Sieg-
|
||||
## oder Niederlage-Dialog.
|
||||
func _spar() -> void:
|
||||
if not TimeSystem.try_spend_slot():
|
||||
_bubble.show_line(exhausted_line)
|
||||
return
|
||||
var player := get_tree().get_first_node_in_group("player")
|
||||
if player == null:
|
||||
push_warning("Kein Spieler für das Sparring gefunden.")
|
||||
return
|
||||
var is_winning := GameState.strength >= STRENGTH_THRESHOLD or GameState.agility >= AGILITY_THRESHOLD
|
||||
var dialogue_path := win_dialogue_path if is_winning else loss_dialogue_path
|
||||
DialogueSystem.start_dialogue(dialogue_path, {
|
||||
"sparring": self,
|
||||
DialogueSystem.PLAYER_SPEAKER_ID: player,
|
||||
})
|
||||
|
||||
|
||||
## Blendet den Prompt ein, sobald der Spieler die Reichweite betritt.
|
||||
func _on_body_entered(_body: Node3D) -> void:
|
||||
_is_player_in_range = true
|
||||
_prompt_label.visible = true
|
||||
|
||||
|
||||
## Blendet den Prompt aus, wenn der Spieler die Reichweite verlässt.
|
||||
func _on_body_exited(_body: Node3D) -> void:
|
||||
_is_player_in_range = false
|
||||
_prompt_label.visible = false
|
||||
1
scripts/gameplay/sparring_station.gd.uid
Normal file
1
scripts/gameplay/sparring_station.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://b0bt7s51qbdj
|
||||
|
|
@ -12,7 +12,7 @@ extends CanvasLayer
|
|||
## Autoload InputPrompts (dynamische Button-Prompts, SPEC.md Abschnitt 2).
|
||||
|
||||
const JOY_MOTION_THRESHOLD := 0.2
|
||||
const TRACKED_NPC_IDS: Array[String] = ["imogen", "violet", "rhiannon", "wren"]
|
||||
const TRACKED_NPC_IDS: Array[String] = ["imogen", "violet", "rhiannon", "wren", "maren"]
|
||||
const PLAYSTATION_NAME_HINTS: Array[String] = [
|
||||
"ps5", "ps4", "dualsense", "dualshock", "sony", "playstation",
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue