CR 8a: Kampf-Kern — leicht/schwer, Ausweichen, Dodge, Block/Parry

- CombatActor als gemeinsame Basis (HP, Ausdauer mit Regeneration,
  Haltung, Stagger); take_hit wertet i-Frames → Parry → Block → Treffer,
  schwere Angriffe umgehen Block und Parry
- PlayerCombat am Spieler: Grammatik über der unveränderten Bewegung —
  leichter Angriff, schwerer Angriff (langer Windup, bricht Blocks),
  Seitenschritt ohne i-Frames, Dodge-Rolle mit i-Fenster, Block mit
  Parry-Fenster; Windup → Active → Recovery, ein Treffer pro Schwung
- Stats: Kraft → Schaden, Schnelligkeit → Tempo und i-Frames,
  Verstand → Parry-Fenster (alle gedeckelt, Feinbalancing bleibt 8e)
- EncounterZone schaltet den Kampf nur in definierten Zonen scharf
  (Option B, keine roamenden Gegner); außerhalb bleibt Movement frei
- Trainings-Dummy mit telegrafiertem Schlag + Greybox-Testarena
  (scenes/combat/combat_testground.tscn)
- Neue Input-Actions heavy_attack (F / L2) und dodge (Leertaste / A✕);
  Tuning daten-getrieben in data/combat/combat_tuning.json
- Buchführung: 8a nach CHANGEREQUESTS_DONE, ROADMAP nachgezogen

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
danny 2026-07-20 19:07:40 +02:00
parent 942672c4ad
commit 32f75a732b
15 changed files with 828 additions and 7 deletions

View file

@ -0,0 +1,109 @@
[gd_scene load_steps=16 format=3]
[ext_resource type="PackedScene" path="res://scenes/player.tscn" id="1_player"]
[ext_resource type="PackedScene" path="res://scenes/ui/debug_overlay.tscn" id="2_debug"]
[ext_resource type="Script" path="res://scripts/gameplay/combat/encounter_zone.gd" id="3_zone"]
[ext_resource type="Script" path="res://scripts/gameplay/combat/training_dummy.gd" id="4_dummy"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"]
sky_horizon_color = Color(0.55, 0.55, 0.6, 1)
ground_horizon_color = Color(0.55, 0.55, 0.6, 1)
[sub_resource type="Sky" id="Sky_sky"]
sky_material = SubResource("ProceduralSkyMaterial_sky")
[sub_resource type="Environment" id="Environment_env"]
background_mode = 2
sky = SubResource("Sky_sky")
tonemap_mode = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_floor"]
albedo_color = Color(0.4, 0.38, 0.36, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_floor"]
size = Vector3(24, 1, 24)
[sub_resource type="BoxMesh" id="BoxMesh_floor"]
material = SubResource("StandardMaterial3D_floor")
size = Vector3(24, 1, 24)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mat"]
albedo_color = Color(0.55, 0.3, 0.25, 1)
[sub_resource type="CylinderMesh" id="CylinderMesh_mat"]
material = SubResource("StandardMaterial3D_mat")
top_radius = 7.0
bottom_radius = 7.0
height = 0.08
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_dummy"]
radius = 0.45
height = 1.9
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dummy"]
albedo_color = Color(0.45, 0.45, 0.5, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_dummy"]
material = SubResource("StandardMaterial3D_dummy")
radius = 0.45
height = 1.9
[sub_resource type="CylinderShape3D" id="CylinderShape3D_zone"]
radius = 7.5
height = 4.0
[node name="CombatTestground" type="Node3D"]
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_env")
[node name="Sun" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.866025, 0.383022, -0.321394, 0, 0.642788, 0.766044, 0.5, -0.663414, 0.55667, 0, 10, 0)
[node name="Floor" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Floor"]
shape = SubResource("BoxShape3D_floor")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Floor"]
mesh = SubResource("BoxMesh_floor")
[node name="RingMat" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, 0)
mesh = SubResource("CylinderMesh_mat")
[node name="EncounterZone" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
collision_layer = 0
collision_mask = 2
script = ExtResource("3_zone")
[node name="CollisionShape3D" type="CollisionShape3D" parent="EncounterZone"]
shape = SubResource("CylinderShape3D_zone")
[node name="Dummy" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3.5)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Dummy"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.95, 0)
shape = SubResource("CapsuleShape3D_dummy")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Dummy"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.95, 0)
mesh = SubResource("CapsuleMesh_dummy")
[node name="HealthLabel" type="Label3D" parent="Dummy"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.3, 0)
billboard = 1
text = "Dummy"
font_size = 48
outline_size = 12
[node name="TrainingDummy" type="Node" parent="Dummy"]
script = ExtResource("4_dummy")
[node name="Player" parent="." instance=ExtResource("1_player")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0)
[node name="DebugOverlay" parent="." instance=ExtResource("2_debug")]

View file

@ -1,9 +1,10 @@
[gd_scene load_steps=9 format=3]
[gd_scene load_steps=10 format=3]
[ext_resource type="Script" path="res://scripts/gameplay/player.gd" id="1_player"]
[ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="2_bubble"]
[ext_resource type="PackedScene" path="res://scenes/ui/lexicon.tscn" id="3_journal"]
[ext_resource type="PackedScene" path="res://scenes/ui/pause_menu.tscn" id="4_pause"]
[ext_resource type="Script" path="res://scripts/gameplay/combat/player_combat.gd" id="5_combat"]
[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_player"]
@ -49,5 +50,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.4, 0)
[node name="PauseMenu" parent="." instance=ExtResource("4_pause")]
[node name="PlayerCombat" type="Node" parent="."]
script = ExtResource("5_combat")
[node name="GooglyEyes" parent="MeshInstance3D" instance=ExtResource("90_eyes")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3)