5c1e881a53
Bull charge damage: - Tunnel-proof swept detection (prev→now segment) for matador gore and bear ram, so a 66 m/s dash no longer skips clean over the thin HitArea. - Horns-first cone (bull_gore_arc): running into an enemy only wounds it when charging roughly at it, not a sideways brush. - Dash is a committed lunge: bypasses the horns cone AND the survival roll, so a dash connect is a guaranteed kill. Cruise charges keep a speed-scaled roll (mat_charge_pierce). Roll ability defers to its own pop (is_rolling guard). Bear: - Horns-first swept ram detection (edge-triggered: one charge = one wound); a tunnelling or point-blank charge now lands where body_entered wouldn't. - Overhead smash lane extends faster (0.1s) and further (20 m). - Leap slam launches the bull from anywhere in the circle (ring_frac 0). - Removed stray-quote syntax errors that broke the script. Matador: - Collider-driven stab (BladeHitbox) with recovery beat + taunt-after-hit so it stops machine-gunning the bull. - A taunting matador answers a charge: spear from range, sword up close. Spear projectile masks the BULL layer so throws connect. Tests: matador_charge/stab/spear/taunt_react, bear_ram/hitbox/fx (+ unified _fake_bull stand-in). Trimmed verbose comments. Note: bear claw-emitter/death work is still WIP (3 bear_boss_test failures). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
45 lines
1.9 KiB
Plaintext
45 lines
1.9 KiB
Plaintext
[gd_scene format=3 uid="uid://o8ocjfprxa7u"]
|
|
|
|
[ext_resource type="Script" uid="uid://cn7fhjkro7637" path="res://bear.gd" id="1_beargd"]
|
|
[ext_resource type="PackedScene" uid="uid://cofv5dbavesis" path="res://Assets/Bear.glb" id="2_bearglb"]
|
|
[ext_resource type="PackedScene" uid="uid://bdbx0wwa73rhp" path="res://Assets/fx/Bear_FX.glb" id="3_bearfx"]
|
|
[ext_resource type="Material" uid="uid://blpkmyikjnhbo" path="res://Materials/M_bear_claw_fx.tres" id="4_clawfx"]
|
|
[ext_resource type="PackedScene" path="res://BearAttackHitboxes.tscn" id="5_hitboxes"]
|
|
|
|
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_body"]
|
|
radius = 1.0
|
|
height = 2.4
|
|
|
|
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_hit"]
|
|
radius = 1.3
|
|
height = 2.7
|
|
|
|
[node name="Bear" type="CharacterBody3D" unique_id=1573237287]
|
|
script = ExtResource("1_beargd")
|
|
|
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=830443382]
|
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2, 0)
|
|
shape = SubResource("CapsuleShape3D_body")
|
|
|
|
[node name="HitArea" type="Area3D" parent="." unique_id=365327397]
|
|
monitorable = false
|
|
|
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="HitArea" unique_id=2111867348]
|
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.35, 0)
|
|
shape = SubResource("CapsuleShape3D_hit")
|
|
|
|
[node name="bear_model" parent="." unique_id=359217823 instance=ExtResource("2_bearglb")]
|
|
|
|
[node name="Bear_FX" parent="bear_model" unique_id=2070553519 instance=ExtResource("3_bearfx")]
|
|
|
|
[node name="Bear_fx_claw_attack_R" parent="bear_model/Bear_FX" index="2" unique_id=1939248432]
|
|
surface_material_override/0 = ExtResource("4_clawfx")
|
|
|
|
[node name="Bear_fx_claw_attack_L" parent="bear_model/Bear_FX" index="3" unique_id=834640978]
|
|
surface_material_override/0 = ExtResource("4_clawfx")
|
|
|
|
[node name="AttackHitboxes" parent="bear_model" instance=ExtResource("5_hitboxes")]
|
|
|
|
[editable path="bear_model"]
|
|
[editable path="bear_model/Bear_FX"]
|