Bump version to 0.5.0

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MXBNaEBmrYDSMcv4NgUWtV

.gdlintrc

@@ -2,4 +2,4 @@ disable:
   - class-definitions-order
   - no-else-return
 max-line-length: 120
-max-file-lines: 1200
+max-file-lines: 3000

.gitea/workflows/ci.yml

@@ -0,0 +1,139 @@
+name: CI
+
+# Gitea Actions is GitHub-Actions-compatible: drop this in .gitea/workflows/, enable Actions on the
+# repo ([actions] ENABLED=true in app.ini, Gitea >= 1.19) and register an act_runner — it then runs
+# on every push / PR. Godot and gdtoolkit are installed with plain shell steps (not the chickensoft
+# setup-godot action), because a self-hosted runner usually can't reach the GitHub action registry
+# (unless DEFAULT_ACTIONS_URL is set to proxy github.com). Only actions/checkout and upload-artifact
+# remain as external actions — both ship with Gitea's default proxy; if yours is offline, mirror them
+# into your instance.
+#
+# It also runs once a day (schedule) as a safety net over main's tip. The `guard` job skips that daily
+# run when the commit already passed — so an idle main isn't re-tested, but a commit whose push-time
+# run was missed/skipped still gets verified. schedule needs Gitea >= 1.21; workflow_dispatch (the
+# manual "Run workflow" button) needs >= 1.23; from 1.23 the cron is evaluated in UTC.
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 4 * * *" # 04:00 UTC daily
+
+# statuses:write lets the test job stamp a `ci/headless` commit status the guard reads back.
+permissions:
+  contents: read
+  statuses: write
+
+env:
+  # The Godot build the team runs (godot --version -> 4.7.beta.custom_build.417cd33bf). Pin this to a
+  # PUBLISHED build from https://github.com/godotengine/godot-builds/releases. If you run a custom
+  # build with no public binary, host the linux headless zip where the runner can reach it and set
+  # GODOT_URL to that (it overrides the constructed URL below).
+  GODOT_VERSION: "4.7-beta1"
+  GODOT_URL: ""
+
+jobs:
+  # On push/PR this passes straight through. On the daily schedule it asks the API whether main's tip
+  # already carries a successful `ci/headless` status (stamped by an earlier run) and, if so, tells the
+  # test job to skip — that's the "don't re-test a commit that already ran" rule.
+  guard:
+    name: Decide whether to run
+    runs-on: ubuntu-latest
+    outputs:
+      run: ${{ steps.decide.outputs.run }}
+    steps:
+      - name: Check for an existing pass on this commit
+        id: decide
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        run: |
+          set -u
+          if [ "${{ github.event_name }}" != "schedule" ]; then
+            echo "event=${{ github.event_name }} -> run"
+            echo "run=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          api="${{ github.api_url }}"; [ -n "$api" ] || api="${{ github.server_url }}/api/v1"
+          curl -sfL -H "Authorization: token ${GITEA_TOKEN}" \
+            "$api/repos/${{ github.repository }}/commits/${{ github.sha }}/statuses?limit=100" \
+            -o /tmp/statuses.json || echo '[]' > /tmp/statuses.json
+          python3 - <<'PY'
+          import json, os
+          try:
+              data = json.load(open("/tmp/statuses.json"))
+          except Exception:
+              data = []
+          items = data.get("statuses", data) if isinstance(data, dict) else data
+          done = any(
+              s.get("context") == "ci/headless" and (s.get("state") or s.get("status")) == "success"
+              for s in (items or [])
+          )
+          with open(os.environ["GITHUB_OUTPUT"], "a") as f:
+              f.write("run=%s\n" % ("false" if done else "true"))
+          print("commit already passed ci/headless -> skip" if done else "no prior pass -> run")
+          PY
+
+  test:
+    name: Lint & headless tests
+    runs-on: ubuntu-latest # must match a label your act_runner registered with
+    needs: guard
+    if: ${{ needs.guard.outputs.run == 'true' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Godot ${{ env.GODOT_VERSION }}
+        run: |
+          set -eux
+          url="${GODOT_URL:-https://github.com/godotengine/godot-builds/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_linux.x86_64.zip}"
+          curl -fL "$url" -o /tmp/godot.zip
+          unzip -o /tmp/godot.zip -d /tmp/godot
+          install -m 755 /tmp/godot/Godot_v*_linux.x86_64 /usr/local/bin/godot
+          godot --version
+
+      - name: Install gdlint (gdtoolkit)
+        # A venv sidesteps PEP-668 "externally managed" pip on recent runner images; putting its bin on
+        # GITHUB_PATH lets run_tests.sh call bare `gdlint` in later steps.
+        run: |
+          set -eux
+          python3 -m venv /tmp/venv
+          /tmp/venv/bin/pip install "gdtoolkit==4.*"
+          echo "/tmp/venv/bin" >> "$GITHUB_PATH"
+
+      # A cold .godot cache (CI always starts cold) needs two import passes: the first imports base
+      # assets, the second resolves scenes that depend on them (the .fbx/.glb -> .scn imports). One pass
+      # leaves those unresolved and the headless tests fail to load them. Warnings exit non-zero.
+      - name: Import resources
+        run: |
+          godot --headless --import || true
+          godot --headless --import || true
+
+      - name: gdlint
+        run: gdlint actors systems ui props levels tests
+
+      - name: Headless tests
+        env:
+          GODOT: godot
+        run: bash run_tests.sh --no-gameplay
+
+      # Stamp the commit so the daily guard recognizes it as already tested. Best-effort: a fork PR whose
+      # token can't write statuses just skips this (the build still passes).
+      - name: Mark commit as tested
+        if: success()
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        run: |
+          api="${{ github.api_url }}"; [ -n "$api" ] || api="${{ github.server_url }}/api/v1"
+          curl -sfL -X POST -H "Authorization: token ${GITEA_TOKEN}" -H "Content-Type: application/json" \
+            "$api/repos/${{ github.repository }}/statuses/${{ github.sha }}" \
+            -d '{"context":"ci/headless","state":"success","description":"headless suite green"}' \
+            >/dev/null || echo "could not post commit status (token lacks statuses:write?)"
+
+      - name: Upload test output on failure
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-output
+          path: tests/output/
+          if-no-files-found: ignore

.gitignore

@@ -2,13 +2,17 @@
 .godot/
 /android/
 
+# Godot editor autosave scratch files (e.g. Bear.tscn12015901897.tmp)
+*.tmp
+
 # JetBrains IDE — contains absolute paths (Godot binary, SDK dirs), varies per user
 .idea/
 
 # Blender render previews (generated by render_anim_preview.py)
-Blender/preview/
+art/blender/preview/
 
-Blender/*.blend1
+# Blender auto-save backups (.blend1, .blend2, … — Blender rewrites these on every save)
+art/blender/*.blend[0-9]
 
 # Test output (generated screenshots, frame strips)
 tests/output/

Animations/anim_publik_mees.gd

@@ -1,8 +0,0 @@
-extends Node3D
-
-
-func _ready() -> void:
-	add_to_group(&"public")   # excluded from debug overlays — see publikum_controller.gd
-	var anim := get_node_or_null(^"AnimationPlayer") as AnimationPlayer
-	if anim:
-		anim.play(&"Juubeldab")

Animations/anim_publik_mees.gd.uid

@@ -1 +0,0 @@
-uid://wj6tgh8nb0ka

Animations/mees_plaksutab.gd

@@ -1,5 +0,0 @@
-extends Node3D
-
-
-func _ready() -> void:
-	$AnimationPlayer.play("ArmatureAction")

Animations/mees_plaksutab.gd.uid

@@ -1 +0,0 @@
-uid://gt3kfchac3m3

Assets/IG_square.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://ch1wqha62vhtb"
-path="res://.godot/imported/IG_square.png-c38dd1a0a4601b6ff4ffec2910ed2ce0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://Assets/IG_square.png"
-dest_files=["res://.godot/imported/IG_square.png-c38dd1a0a4601b6ff4ffec2910ed2ce0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

Assets/bear_fx.tscn

@@ -1,3 +0,0 @@
-[gd_scene format=3 uid="uid://c2dx4khl7voyd"]
-
-[node name="BearFx" type="Node3D" unique_id=1568304275]

Assets/bear_level.tscn

@@ -1,46 +0,0 @@
-[gd_scene format=3 uid="uid://by4ifsgxlv0gj"]
-
-[ext_resource type="PackedScene" uid="uid://bm6rmt3xprhjs" path="res://Assets/bear_level_arena.glb" id="1_beararena"]
-[ext_resource type="Script" path="res://matador_spawn.gd" id="2_spawn"]
-[ext_resource type="PackedScene" path="res://Bear.tscn" id="3_bear"]
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_floor"]
-
-[node name="bear_level" type="Node3D" unique_id=2020009824]
-
-[node name="Node3D" type="Node3D" parent="." unique_id=1366355859]
-
-[node name="StaticBody3D" type="StaticBody3D" parent="Node3D" unique_id=721553462]
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/StaticBody3D" unique_id=474515358]
-transform = Transform3D(30, 0, 0, 0, 1, 0, 0, 0, 30, 0, -0.5, 0)
-shape = SubResource("BoxShape3D_floor")
-
-[node name="bear_level_arena" parent="." unique_id=948414670 instance=ExtResource("1_beararena")]
-transform = Transform3D(2.875, 0, 0, 0, 2.875, 0, 0, 0, 2.875, 0, 0, 0)
-
-[node name="MatadorSpawner" type="Node3D" parent="." unique_id=1869467620]
-script = ExtResource("2_spawn")
-enemy_scene = ExtResource("3_bear")
-
-[node name="Lights" type="Node3D" parent="." unique_id=1435665429]
-
-[node name="DirectionalLight3D" type="DirectionalLight3D" parent="Lights" unique_id=1814200565]
-transform = Transform3D(0.01535992, 0.56825536, -0.82270896, 0.16280846, 0.8104039, 0.56279576, 0.9865382, -0.14258848, -0.08006904, -4.08134, 9.197985, 0.97087634)
-light_energy = 0.4
-light_indirect_energy = 0.767
-shadow_blur = 0.47
-
-[node name="SpotLight3D2" type="SpotLight3D" parent="Lights" unique_id=2071037822]
-transform = Transform3D(0.904133, 0.30962402, -0.2944087, 0.3084627, 0.0037425472, 0.9512291, 0.2956252, -0.95085174, -0.0921237, -3.629381, 10.86347, -2.0124264)
-light_energy = 16.0
-light_indirect_energy = 26.095
-distance_fade_enabled = true
-spot_range = 32.90586
-spot_angle = 73.93
-
-[node name="SUN_DirectionalLight3D2" type="DirectionalLight3D" parent="Lights" unique_id=1003843933]
-transform = Transform3D(0.45811793, 0.34843865, -0.81775206, 0.5316611, 0.62986195, 0.56622505, 0.7123655, -0.69416475, 0.10329977, 0, 8.980043, 0)
-light_energy = 0.106
-shadow_enabled = true
-shadow_blur = 10.0

Assets/matador.gd

@@ -1,5 +0,0 @@
-extends Node3D
-
-
-func _ready() -> void:
-	$AnimationPlayer.play("Taunt")

Assets/matador.gd.uid

@@ -1 +0,0 @@
-uid://bn3xwnlktwdlf

Assets/matador_2.tscn

@@ -1,38 +0,0 @@
-[gd_scene format=3 uid="uid://bl6jlbq1dpkc"]
-
-[ext_resource type="PackedScene" uid="uid://eu2lqjhowj4t" path="res://Assets/Matador.glb" id="1_m7x6l"]
-[ext_resource type="Script" uid="uid://dpoq87w5pvqa" path="res://matador_2.gd" id="2_mftd2"]
-
-[node name="matador2" unique_id=1179710042 instance=ExtResource("1_m7x6l")]
-script = ExtResource("2_mftd2")
-
-[node name="Skeleton3D" parent="Armature" parent_id_path=PackedInt32Array(1269629432) index="0" unique_id=978366810]
-bones/0/position = Vector3(0.056660548, 0.6424767, -0.0167365)
-bones/0/rotation = Quaternion(0.080643006, 0, 0, 0.996743)
-bones/1/rotation = Quaternion(0.083861314, 0, 0, 0.9964774)
-bones/3/rotation = Quaternion(0.04833339, 0.5302496, -0.71466804, 0.4535955)
-bones/4/rotation = Quaternion(0.031473875, -0.17018215, -0.15981929, 0.97185665)
-bones/5/rotation = Quaternion(0.6747468, -0.021427644, -0.06245957, 0.7350895)
-bones/6/rotation = Quaternion(3.1828083e-08, -9.5969504e-08, -0.0587008, 0.99827564)
-bones/7/rotation = Quaternion(0.1907551, 0.20328633, 0.7258648, 0.6288143)
-bones/8/rotation = Quaternion(0.16639966, -0.05474137, 0.010937729, 0.984477)
-bones/9/rotation = Quaternion(0.5914298, 0.005839911, -0.041949864, 0.8052435)
-bones/10/rotation = Quaternion(2.3105285e-08, 1.0152064e-07, 0.05870079, 0.99827564)
-bones/11/rotation = Quaternion(0.39202613, 0.47060952, 0.5799399, 0.53713316)
-bones/12/rotation = Quaternion(0.62021786, 0.40894383, 0.44191495, 0.5027981)
-bones/13/rotation = Quaternion(-0.11584477, 0.0021730124, 0.6343679, 0.7642989)
-bones/14/rotation = Quaternion(0.1454883, 0.14013468, -0.7254941, 0.65791625)
-bones/15/rotation = Quaternion(0.71668345, 0.065085255, -0.6923973, -0.05210323)
-bones/16/rotation = Quaternion(-0.10161893, -0.0019664483, -0.65947086, 0.7448275)
-bones/17/rotation = Quaternion(0.06964938, -0.042099692, 0.74388325, 0.6633358)
-bones/18/rotation = Quaternion(0.5305965, -0.28927496, 0.76720744, -0.21489602)
-bones/19/position = Vector3(0.16341288, 0.31487355, 0.3966543)
-bones/20/position = Vector3(0.22012731, 0.38421977, 0.95168185)
-bones/21/position = Vector3(-0.09492579, 0.40446192, -0.46390092)
-bones/21/rotation = Quaternion(0.7216726, 0.064735115, -0.6891729, 0.0062273443)
-bones/22/position = Vector3(-0.22012731, 0.38421977, 0.95168185)
-bones/23/position = Vector3(-0.0382514, 1.7423625, 0.0026792884)
-bones/23/rotation = Quaternion(0.8626007, 0.0068245474, -0.099159576, -0.49602506)
-bones/23/scale = Vector3(0.6647317, 1.001677, 1.0066445)
-bones/24/rotation = Quaternion(-0.007878712, 8.3020435e-09, -0.0023950166, 0.9999661)
-bones/25/rotation = Quaternion(5.5870206e-09, 5.5879354e-09, -2.0518176e-09, 1)

Assets/matador_intro_menu.gd

@@ -1,12 +0,0 @@
-extends Node3D
-
-
-@onready var animation_player: AnimationPlayer = $AnimationPlayer
-
-func _ready():
-	animation_player.play("Taunt")
-	animation_player.animation_finished.connect(_on_animation_finished)
-
-func _on_animation_finished(anim_name):
-	if anim_name == "Taunt":
-		animation_player.play("Taunt")

Assets/matador_intro_menu.gd.uid

@@ -1 +0,0 @@
-uid://dycnoiadljbb1

Assets/menu_bg.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bxv1uuymonrp6"
-path="res://.godot/imported/menu_bg.png-3906063022fa3c81090e3c663f8866b0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://Assets/menu_bg.png"
-dest_files=["res://.godot/imported/menu_bg.png-3906063022fa3c81090e3c663f8866b0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

Bear.tscn

@@ -1,29 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://bear_scene_v1"]
-
-[ext_resource type="Script" path="res://bear.gd" id="1_beargd"]
-[ext_resource type="PackedScene" uid="uid://cofv5dbavesis" path="res://Assets/Bear.glb" id="2_bearglb"]
-
-[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"]
-script = ExtResource("1_beargd")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-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="."]
-monitoring = true
-monitorable = false
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="HitArea"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.35, 0)
-shape = SubResource("CapsuleShape3D_hit")
-
-[node name="bear_model" parent="." instance=ExtResource("2_bearglb")]

Blender/matador2.gd.uid

@@ -1 +0,0 @@
-uid://ymaeifakqovf

CLAUDE.md

@@ -10,31 +10,64 @@ I am a **Godot 4.6+ expert**. I follow current best practices for GDScript, scen
 
 ## Project structure
 
+Files are grouped by **role**, not by type. Scripts and scenes are `snake_case`;
+`PascalCase` is reserved for `class_name` identifiers (this avoids case-insensitive
+filesystem aliasing on the web/macOS targets).
+
+```
+actors/{player,matador,bear}/   the three characters (script + scene together)
+systems/combat/                 hitbox.gd, damage_event.gd, physics_layers.gd
+systems/fx/                     Fx autoload + effect scenes (Siim's authoring dir)
+systems/input/                  controls_manager.gd, touch_controls.gd
+systems/debug/                  debug_params.gd (DP), debug_draw.gd, console.gd
+systems/render/                 rigid_skin.gd, ps1_filter (post-process)
+systems/crowd/                  billboard audience
+systems/config/                 settings.gd (Settings autoload)
+ui/                             hud, mobile_hud, main_menu, ui_theme/fonts, overlays
+props/                          barrels, torch
+levels/                         game_shell.tscn + level modules
+tools/ tests/                   editor/bake scripts, headless tests
+art/                            all raw art, grouped by role (snake_case):
+  characters/ levels/ weapons/    bull/matador/bear, arena/lobby geometry, spear/sword
+  fx/ anim/ textures/             bear_fx, crowd_clap, baked sheets
+  ui/ icons/ fonts/               menu art, ability icons, Cinzel fonts
+  hdri/ materials/                sky HDRIs, shared StandardMaterial3D resources
+  blender/                        Siim's .blend working files (Godot-ignored)
+```
+
 | Path | Purpose |
 |---|---|
-| `scene.tscn` | The reusable **shell** loaded for every level: player, camera, HUD, PS1 filter, and an empty `LevelRoot`. Its `game_shell.gd` instances the active level's module into `LevelRoot` at runtime |
+| `levels/game_shell.tscn` | The reusable **shell** loaded for every level: player, camera, HUD, PS1 filter, and an empty `LevelRoot`. Its `game_shell.gd` instances the active level's module into `LevelRoot` at runtime |
 | `levels/` | The level system: per-level module scenes plus the code that defines, loads and sequences them (see rows below) |
 | `levels/game_shell.gd` | Shell controller — on load, frees any current level module and instances `Run.active_level().level_scene` into `LevelRoot`. Swapping the whole subtree (never hiding it) is what keeps one level's meshes/colliders/spawners from leaking into the next |
 | `levels/arena_level.tscn` | The arena **level module**: floor + wall colliders, arena meshes, `MatadorSpawner` (with child `Node3D` spawn points placed by the designer), lighting, audience (`PublikNode`). Instanced into the shell's `LevelRoot` |
 | `levels/bear_level.tscn` | The Bear's Den **level module**: bear-arena mesh, its own floor collider, lighting, and a `BearSpawner` (`bear_spawn.gd`) that places the bear at center. Instanced into the shell's `LevelRoot` |
-| `Player.tscn` | Player scene root (`CharacterBody3D`) |
+| `actors/player/player.tscn` | Player scene root (`CharacterBody3D`) |
-| `player.gd` | Movement, charge, turning logic |
+| `actors/player/player.gd` | Movement, charge, turning, and abilities (kick/dash/slam/roll). Ability & movement particle FX are **not** built here — they're authored scenes in `systems/fx/` (`bull_*.tscn`), fired via `Fx.spawn()` (one-shots) / `Fx.attach()` (continuous) |
+| `actors/player/bull_impact_fx.gd` | Bull's coded, non-particle impact FX (the slam shockwave rings + kick flash-pop — tweened meshes, not CPUParticles3D, so they can't be `systems/fx/` scenes). Created by `player.gd` |
+| `actors/player/bull_legs.gd` | Bull body-wobble + tail Verlet-chain simulation. Created by `player.gd` |
 | `camera_spring_arm.gd` | Mouse-look pivot (`Node3D` + `SpringArm3D`) |
 | `camera_follow.gd` | Smooth camera follow (`Camera3D`) |
-| `matador.gd` | Matador AI (wander / ragdoll state machine) |
+| `actors/matador/matador.gd` | Matador AI (wander / ragdoll state machine) |
 | `levels/matador_spawn.gd` | Arena spawner — one matador per designer-placed child `Node3D` spawn point (each enters with a jump-roll toward center); falls back to a programmatic spread if no spawn points are present. Also handles the split-on-death hydra logic |
 | `levels/bear_spawn.gd` | Bear-level spawner — instantiates `enemy_scene` at the arena center; emits the same `all_defeated` / `matador_killed` signals as `matador_spawn.gd` |
-| `Bear.tscn` / `bear.gd` | Dark-Souls-style bear boss (`CharacterBody3D`). Routine state machine (wind-up → active → recovery) picking telegraphed moves by range band: Double Swipe / Overhead Smash (close), Leap Slam (mid-far), plus Stalk (2-leg walk-in) / Prowl (4-leg lope) positioning. Melee steps in during the swing (`bear_lunge_speed`) + tracks the bull; the leap is frame-synced to JUMP_SMASH so the paws hit ground on the impact frame (`bear_leap_impact_frame`); slams kick up dust + shake. Combos chain, hyper-armour mid-swing + poise (`bear_stagger_cd`), phase 2 enrage under `bear_enrage_frac` HP. Never damages the bull by colliding — only swings/slams. Joins `&"matador"` so bull abilities already hit it. Tuning under the `Bear` DP section |
+| `actors/bear/bear.tscn` / `actors/bear/bear.gd` | Dark-Souls-style bear boss (`CharacterBody3D`). Routine state machine (wind-up → active → recovery) picking telegraphed moves by range band: Double Swipe / Overhead Smash (close), Leap Slam (mid-far), plus Stalk (2-leg walk-in) / Prowl (4-leg lope) positioning. Melee steps in during the swing (`bear_lunge_speed`) + tracks the bull; the leap is frame-synced to JUMP_SMASH so the paws hit ground on the impact frame (`bear_leap_impact_frame`); slams kick up dust + shake. Combos chain, hyper-armour mid-swing + poise (`bear_stagger_cd`), phase 2 enrage under `bear_enrage_frac` HP. Never damages the bull by colliding — only swings/slams. A horns-first bull charge wounds it (`_sweep_bull_ram`: swept prev→now so a tunnelling/point-blank charge still lands, gated by `bear_ram_reach` + `bull_gore_arc`, edge-triggered = one charge per wound). Joins `&"matador"` so bull abilities already hit it. Tuning under the `Bear` DP section |
-| `levels/run_state.gd` | Run progression autoload (`Run`) — Slay-the-Spire map + player position across fights |
+| `actors/bear/bear_attack_hitboxes.tscn` | The bear's attack colliders as a self-contained sub-scene (instanced under `bear_model`): a `LeapSlamHitbox` (Hitbox + cylinder = ground circle) and `SmashHitbox` (Hitbox + box = forward shockwave lane), plus an `AnimationPlayer` whose `leap_slam` / `smash_travel` clips author each collider's size + travel — scrub to tweak, like `Bear_FX`. `actors/bear/bear.gd` only fires the clip, arms the knock-up shaping, and sweeps for overlaps while it runs (see `_setup_attack_hitboxes` / `_start_attack_hitbox`) |
-| `levels/level_def.gd` | `LevelDef` resource — a level's name / map colour / `scene_path` (always the shell) / `level_scene` (the level module instanced into the shell) / optional `enemy_scene` (arena wave vs. a boss like the bear) |
+| `actors/matador/sword.tscn` / `systems/combat/hitbox.gd` | The matador's sword wrapper (glb + editor-tweakable `BladeHitbox`). `systems/combat/hitbox.gd` (`class_name Hitbox`, Area3D) is the shared attack collider: `activate()`/`deactivate()` gate an active window, `sweep()` catches bodies already inside (AoE), and knock-up can ramp by distance (`knock_up_min_dist`/`_max_dist`) for the bear's outer-ring launch / further-hit-flies-higher |
-| `levels/map_node.gd` | `MapNode` — one runtime node on the run map (position, level, links) |
+| `levels/run_state.gd` | Run progression autoload (`Run`) — the lobby hub and which level is being fought, across scene reloads |
-| `levels/MapScreen.tscn` / `levels/map_screen.gd` | Between-fights map screen; win → pick a node → next level |
+| `levels/level_def.gd` | `LevelDef` resource — a level's name / `scene_path` (always the shell) / `level_scene` (the level module instanced into the shell) / optional `enemy_scene` (arena wave vs. a boss like the bear) |
-| `debug_params.gd` | Runtime-tunable parameter registry (autoload `DP`) |
+| `systems/crowd/crowd_marker.gd` | `CrowdMarker` (`@tool Node3D`, `class_name`) — designer drops one per billboard spectator via the editor's Add-Node dialog; picks one of six 60°-spaced facings from the `orientation` dropdown. Draws an editor-only preview (slab + forward arrow, never serialised) and joins the `&"crowd_marker"` group |
-| `Assets/` | Raw 3D assets (`.glb`, `.fbx`) |
+| `systems/crowd/crowd_billboards.gd` / `systems/crowd/crowd_billboard.gdshader` | `MultiMeshInstance3D` that harvests every `CrowdMarker` (group `&"crowd_marker"`) into one draw call, using each marker's world position + chosen facing. Front/back sprite sheet baked by `tools/bake_crowd_sheet.gd`; falls back to a generated inward-facing ring when no markers are placed |
-| `Blender/` | Blender source files, animation scripts, FBX exports |
+| `systems/debug/debug_params.gd` | Runtime-tunable parameter registry (autoload `DP`). Mobile-relevant flags: `force_touch_controls`, `touch_debug` (also enabled on-device with `?debug=1` in the page URL — shows the live profiler overlay in `systems/input/touch_controls.gd`), and `use_rigid_skin` (default **off** — native GPU skinning everywhere now that the 4.7 web templates fixed the Mali/ANGLE invisible-skinning bug; `systems/render/rigid_skin.gd` is a retained opt-in fallback). Rigid-skin is gated through `Controls.rigid_skin_enabled()`, which a page URL param overrides for on-device A/B with no console: `?skin=1` forces the workaround on (for a device where native skinning still fails), `?noskin=1` forces native off. Turning the workaround off also removes its per-spawn SurfaceTool rebuild, which was the arena's matador-spawn lag |
-| `Blender/create_matador_anims.py` | Creates walk + idle animations and exports FBX |
+| `systems/input/touch_controls.gd` | On-screen thumb UI for touch/web (`CanvasLayer`, instanced by `ui/hud.gd`, self-gating on `Controls.use_touch_ui()`): a floating left-side joystick feeding the `move_*` actions + a right-side ability cluster, drawn/hit-tested in one IGNORE-filtered Control from raw `_input()`. The joystick self-heals — the latest left-zone touch re-acquires it (`_stick_index`), and a relayout / focus-out / vanished touch resets state so a dropped touchend can't strand a stuck stick. Ability buttons use grown hit-rects + a press flash. `_draw_debug()` (gated on `Controls.debug_overlay()` — DP `touch_debug` or `?debug=1`) is a live on-device profiler reading Godot's `Performance` monitors: FPS/frame-ms with a bottleneck verdict, `process`(main-thread GDScript) vs `physics`(ragdoll/Jolt) ms with 2 s peak-hold, draw calls/objects/primitives, node count, render resolution, and `crossOriginIsolated` — so a lag spike is pinned to CPU-script vs CPU-physics vs GPU-fill instead of guessed |
-| `Blender/render_anim_preview.py` | Renders animation preview PNGs for visual verification |
+| `ui/web_start_gate.gd` | Autoload `WebStartGate` — "TAP TO PLAY" panel shown on web+touch before play; the tap drives `Controls.request_fullscreen_landscape()` so the fullscreen/orientation churn happens with no in-flight touch to lose. Re-armable: polls browser fullscreen state and returns if the player leaves it (iPhone Safari can't fullscreen, so it stops nagging once a request never takes) |
-| `Blender/preview/` | Output directory for animation preview images |
+| `ui/mobile_hud.gd` | Mobile-only health readouts (`CanvasLayer`, instanced by `ui/hud.gd` only on touch): big bull pip row top-left + a Souls-style bear boss bar top-centre (discovered via group `&"bear"`, tracks `health_changed`). The desktop bottom pip cluster is hidden on touch |
+| `ui/orientation_guard.gd` | Autoload `OrientationGuard` — full-screen "rotate your device" prompt shown on touch devices while portrait |
+| `art/` | All raw art, grouped by role (`characters/ levels/ weapons/ fx/ anim/ textures/ ui/ icons/ fonts/`). GLBs use **Extract Textures** import, so their embedded textures land beside them (e.g. `art/levels/arena_*.png`) named from the GLB — expected, keep them tracked |
+| `art/blender/` | Blender source files, animation scripts, FBX exports (Godot-ignored via `.gdignore`) |
+| `art/blender/create_matador_anims.py` | Creates walk + idle animations and exports FBX |
+| `art/blender/render_anim_preview.py` | Renders animation preview PNGs for visual verification |
+| `art/blender/preview/` | Output directory for animation preview images |
 | `tests/` | Headless test scripts (screenshot capture, logic validation) |
 | `addons/rider-plugin/` | JetBrains Rider IDE integration |
 
@@ -68,7 +101,7 @@ I am a **Godot 4.6+ expert**. I follow current best practices for GDScript, scen
 
 ## Animation & bone conventions
 
-### Blender rig (matador_v02)
+### Blender rig (matador)
 - **Armature bones:** `matador` (root) → `COG` → `chest` → `head`, `collarbone_L/R` → `arm_L/R` → `forearm_L/R` → `hand_L/R`, `leg_L/R` → `shin_L/R` → `foot_L/R`
 - **Rotation mode:** All animated bones use **XYZ Euler** (set in `create_matador_anims.py`)
 - **Bone-local axes:** Swing (forward/back) is on **local X**. Arm lowering from T-pose is on **local Y** (positive = left arm down, negative = right arm down). Knee bend is **positive X** (shins only bend backward).
@@ -86,8 +119,8 @@ After FBX import, animations appear as `Armature|walk` and `Armature|idle` in An
 
 ### Verification workflow
 1. Edit bones/animations in Blender (`create_matador_anims.py`)
-2. Run render preview: `blender --background Blender/matador_v02.blend --python Blender/render_anim_preview.py`
+2. Run render preview: `blender --background art/blender/matador.blend --python art/blender/render_anim_preview.py`
-3. Inspect PNGs in `Blender/preview/` — check bone orientations **before** exporting to Godot
+3. Inspect PNGs in `art/blender/preview/` — check bone orientations **before** exporting to Godot
 4. Export FBX (done automatically by `create_matador_anims.py`)
 5. Re-import in Godot and test in-game
 
@@ -98,12 +131,26 @@ After FBX import, animations appear as `Armature|walk` and `Armature|idle` in An
 bash run_tests.sh
 
 # Individual tests:
-gdlint *.gd levels/*.gd tests/*.gd                                # GDScript lint (gdtoolkit, installed via uv)
+gdlint actors systems ui props levels tests                      # GDScript lint (gdtoolkit, installed via uv)
 godot --headless --script tests/logic_test.gd         # pure logic, ~2 s
+godot --headless --script tests/harness_selftest.gd   # shared test_helpers: seeded RNG + approx + tally, ~1 s
+godot --headless --script tests/damage_pipeline_test.gd # bull's hit reception (take_sword_hit + typed receive_damage/DamageEvent), ~3 s
+godot --headless --script tests/fx_gallery_test.gd    # every registered Fx effect spawns + self-frees, ~2 s
 godot --headless --script tests/performance_test.gd   # frame-budget regression guard, ~4 s
+godot --headless --script tests/ragdoll_perf_test.gd  # on-hit spike breakdown: ragdoll build / sim-start / blood / mass hit, ~90 s
 godot --headless --script tests/gameplay_test.gd      # full scene, bone sanity, ~4 s
 godot --headless --script tests/level_switch_test.gd  # no arena geometry leaks into the bear level, ~2 s
+godot --headless --script tests/touch_controls_test.gd # joystick self-heals: relayout/focus-out/vanished-touch never strand a stuck stick, ~2 s
+godot --headless --script tests/ui_layout_test.gd     # UI layout invariants (no pixels): HUD/menu stay on-screen, text fits, tap targets ≥44px, scroll works — across resolutions + pseudo-locale, ~6 s
+godot --headless --script tests/rigid_skin_test.gd    # web mesh conversion keeps every material (no bald / recoloured matadors), ~2 s
 godot --headless --script tests/bear_boss_test.gd     # bear boss moveset: routines, leap landing, hyper-armour, ~10 s
+godot --headless --script tests/bear_fx_test.gd       # bear attack-FX: each Bear_FX clip pops its mesh + self-hides, ~2 s
+godot --headless --script tests/bear_hitbox_test.gd   # bear attack colliders: leap launches everywhere (ring_frac slider) + smash lane travel, ~3 s
+godot --headless --script tests/bear_ram_test.gd      # a horns-first bull charge wounds the bear once; away/wide/slow spared, ~3 s
+godot --headless --script tests/matador_stab_test.gd  # matador's BladeHitbox thrust gores a stationary bull, and a landed stab breaks it off to taunt (anti-spam), ~2 s
+godot --headless --script tests/matador_taunt_react_test.gd # a taunting matador answers a charge: spear from range, sword up close, ignores non-charges, ~2 s
+godot --headless --script tests/matador_charge_test.gd # bull's charge is swept (tunnel-proof) so a fast dash still gores; a committed charge pierces the survival roll, ~2 s
+godot --headless --script tests/matador_spear_test.gd # thrown spear masks the BULL layer and hits a stationary bull, ~2 s
 
 # Gameplay test with real rendering (inspect frame strip visually):
 godot --script tests/gameplay_test.gd                 # opens a window, saves real screenshots

Intro_MENU.tscn

@@ -1,137 +0,0 @@
-[gd_scene format=3 uid="uid://c4df4qgpc3d5g"]
-
-[ext_resource type="PackedScene" uid="uid://eu2lqjhowj4t" path="res://Assets/Matador.glb" id="1_eicjn"]
-[ext_resource type="Script" uid="uid://dycnoiadljbb1" path="res://Assets/matador_intro_menu.gd" id="2_5jr0i"]
-[ext_resource type="PackedScene" uid="uid://dio67r8ambe7h" path="res://Assets/arena_placeholder_v01.glb" id="3_1v6n4"]
-[ext_resource type="PackedScene" uid="uid://dxe72ig8gfbcg" path="res://Assets/arena model2026.glb" id="3_5jr0i"]
-[ext_resource type="PackedScene" uid="uid://crtm0xtiql3r8" path="res://Player.tscn" id="4_eicjn"]
-[ext_resource type="Texture2D" uid="uid://3syhacswepyj" path="res://HDRI/kloppenheim_06_puresky_4k.hdr" id="6_1v6n4"]
-
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_eicjn"]
-
-[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_w7j4y"]
-panorama = ExtResource("6_1v6n4")
-energy_multiplier = 5.6
-
-[sub_resource type="Sky" id="Sky_3el7n"]
-sky_material = SubResource("PanoramaSkyMaterial_w7j4y")
-
-[sub_resource type="Environment" id="Environment_5jr0i"]
-background_mode = 2
-background_energy_multiplier = 0.18
-sky = SubResource("Sky_3el7n")
-ambient_light_color = Color(0.31061712, 0.31061712, 0.3106171, 1)
-ambient_light_energy = 16.0
-ssao_enabled = true
-ssao_radius = 1.17
-ssao_intensity = 0.0
-glow_intensity = 0.34
-glow_strength = 0.29
-glow_bloom = 0.1
-fog_light_color = Color(2.211, 2.211, 2.211, 1)
-fog_light_energy = 0.01
-fog_density = 0.0399
-volumetric_fog_enabled = true
-volumetric_fog_density = 0.0005
-volumetric_fog_emission = Color(1, 1, 1, 1)
-volumetric_fog_emission_energy = 7.85
-volumetric_fog_anisotropy = 0.9
-volumetric_fog_length = 69.07
-
-[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_5jr0i"]
-dof_blur_far_enabled = true
-dof_blur_far_distance = 26.01
-dof_blur_near_enabled = true
-dof_blur_near_distance = 2.6
-dof_blur_near_transition = 5.0
-
-[node name="IntroMenu" type="Node3D" unique_id=2130618263]
-
-[node name="Matador" parent="." unique_id=166852612 instance=ExtResource("1_eicjn")]
-transform = Transform3D(-0.56715536, 0, -0.8236109, 0, 1, 0, 0.8236109, 0, -0.56715536, 5.2114463, -0.08998108, 1.8927763)
-script = ExtResource("2_5jr0i")
-
-[node name="Skeleton3D" parent="Matador/Armature" parent_id_path=PackedInt32Array(166852612, 1447304122) index="0" unique_id=357848305]
-bones/0/position = Vector3(0.056660548, 0.6424767, -0.0167365)
-bones/0/rotation = Quaternion(0.013179442, -0.2660563, 0.073319815, 0.9610747)
-bones/1/rotation = Quaternion(0.06234612, 0.049236443, 0.08183311, 0.99347484)
-bones/2/rotation = Quaternion(-0.073883414, -0.049860783, -0.17668208, 0.9802238)
-bones/3/rotation = Quaternion(0.1986702, -0.17794952, -0.71790075, 0.6430262)
-bones/4/rotation = Quaternion(0.34491858, -0.4473084, -0.25076818, 0.7861691)
-bones/5/rotation = Quaternion(0.2577085, 0.103201896, -0.6748433, 0.68375605)
-bones/6/rotation = Quaternion(1.7417646e-08, -1.0305205e-07, -0.05870078, 0.99827564)
-bones/7/rotation = Quaternion(0.24033272, 0.3103031, 0.5222128, 0.7571301)
-bones/8/rotation = Quaternion(5.5530215e-08, 1.2911333e-07, 0.055464897, 0.99846065)
-bones/9/rotation = Quaternion(-6.3051346e-09, -3.6333955e-07, 0.005667881, 0.999984)
-bones/10/rotation = Quaternion(2.5839595e-08, 9.468444e-08, 0.058700778, 0.99827564)
-bones/11/rotation = Quaternion(0.39202607, 0.47060946, 0.57993996, 0.53713304)
-bones/12/rotation = Quaternion(0.8712108, 0.008231261, 0.48523128, 0.073990606)
-bones/13/rotation = Quaternion(-0.056263044, 0.0027001738, 0.3080972, 0.9496859)
-bones/14/rotation = Quaternion(0.016082464, 0.024660494, -0.86586916, 0.4994036)
-bones/15/rotation = Quaternion(0.6067664, -0.3062479, -0.7163194, 0.15790276)
-bones/16/rotation = Quaternion(-0.0731876, -0.0023153822, -0.47496143, 0.87695485)
-bones/17/rotation = Quaternion(-0.11824294, -0.17776872, 0.80557114, 0.55269533)
-bones/18/rotation = Quaternion(0.5305965, -0.28927496, 0.76720744, -0.21489605)
-bones/20/position = Vector3(0.22012731, 0.38421977, 0.36399037)
-bones/21/position = Vector3(-0.23671798, 0.052281797, -0.027087089)
-bones/21/rotation = Quaternion(0.5078295, -0.4920459, -0.4920459, 0.50782955)
-bones/22/position = Vector3(-0.39721552, 0.31719273, 0.3595722)
-bones/23/position = Vector3(-0.9167187, 1.3206767, 0.42621902)
-bones/23/rotation = Quaternion(0.9993525, -0.0021175682, 0.03502641, -0.00795782)
-bones/24/rotation = Quaternion(0.08874816, -0.018719967, -0.04671622, 0.99478185)
-bones/25/rotation = Quaternion(0.09634846, -0.0268489, -0.04050248, 0.9941608)
-
-[node name="matador" parent="Matador/Armature/Skeleton3D" index="0" unique_id=593562242]
-transform = Transform3D(0.8642424, 0, 0.50307554, 0, 1, 0, -0.50307554, 0, 0.8642424, 0, 0, 0)
-
-[node name="Muleta" parent="Matador/Armature/Skeleton3D" index="1" unique_id=978680467]
-cast_shadow = 0
-
-[node name="Camera3D" type="Camera3D" parent="." unique_id=1531255459]
-transform = Transform3D(0.42176014, 0.2362673, 0.8753835, -0.10687317, 0.97167695, -0.21076548, -0.900387, -0.0046625203, 0.4350652, 8.41945, 0.17132203, 2.0652685)
-fov = 41.6
-near = 0.001
-
-[node name="arena model2026" parent="." unique_id=179544183 instance=ExtResource("3_5jr0i")]
-transform = Transform3D(-0.83746713, 0, 0.54648757, 0, 0.99999994, 0, -0.54648757, 0, -0.83746713, 3.8733478, -0.6, -1.1080065)
-
-[node name="arena_placeholder_v01" parent="." unique_id=1343590504 instance=ExtResource("3_1v6n4")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.3344436, 0, -1.5401263)
-visible = false
-
-[node name="StaticBody3D" type="StaticBody3D" parent="arena_placeholder_v01" unique_id=340133176]
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="arena_placeholder_v01/StaticBody3D" unique_id=201484167]
-transform = Transform3D(-33.265, 4.9526625e-07, -2.9081186e-06, 5.0228755e-06, 3.28, 0, -2.9081186e-06, 4.329755e-14, 33.265, 0, -3.3065948, 0)
-shape = SubResource("CylinderShape3D_eicjn")
-
-[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=660229295]
-transform = Transform3D(0.9491592, 0.31479403, -0.0014368258, -0.28033537, 0.84731936, 0.45106864, 0.14321098, -0.4277331, 0.89248836, 1.1162033, 7.3956842, -4.480528)
-light_energy = 1.32
-shadow_enabled = true
-shadow_blur = 8.689
-
-[node name="DirectionalLight3D2" type="DirectionalLight3D" parent="." unique_id=498871251]
-transform = Transform3D(0.835524, -0.5376153, 0.11344351, -0.48260456, -0.6193575, 0.6192651, -0.26266432, -0.572159, -0.7769435, 1.1162033, 7.3956842, -4.480528)
-visible = false
-light_energy = 0.415
-light_indirect_energy = 16.0
-light_volumetric_fog_energy = 1.11
-shadow_blur = 10.0
-
-[node name="Player" parent="." unique_id=165510044 instance=ExtResource("4_eicjn")]
-transform = Transform3D(0.9563367, 0, 0.29226705, 0, 1, 0, -0.29226705, 0, 0.9563367, 3.0920272, 0.39692497, -4.302477)
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=114793752]
-environment = SubResource("Environment_5jr0i")
-camera_attributes = SubResource("CameraAttributesPractical_5jr0i")
-
-[node name="SpotLight3D" type="SpotLight3D" parent="." unique_id=1428020323]
-transform = Transform3D(0.94930077, -0.05846006, -0.30888584, 0.21308771, 0.8420559, 0.4955155, 0.23113126, -0.53621286, 0.81182146, -20.807917, 10.690277, 20.135067)
-visible = false
-light_energy = 16.0
-light_volumetric_fog_energy = 16.0
-shadow_enabled = true
-spot_range = 84.316696
-
-[editable path="Matador"]

Making a GOOD third person camera in Godot 4 - YouTube.url

@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://www.youtube.com/watch?v=ZCb12AHKMfE

Player.tscn

@@ -1,65 +0,0 @@
-[gd_scene format=3 uid="uid://crtm0xtiql3r8"]
-
-[ext_resource type="Script" uid="uid://bn777gguclud5" path="res://player.gd" id="1_xhfnw"]
-[ext_resource type="Script" uid="uid://cpyq2r5cq653g" path="res://camera_iso.gd" id="2_camera_iso"]
-[ext_resource type="PackedScene" uid="uid://bun14xmk20pcj" path="res://Assets/bull.fbx" id="4_e80uo"]
-
-[sub_resource type="SphereShape3D" id="SphereShape3D_chest"]
-radius = 0.35
-
-[sub_resource type="SphereShape3D" id="SphereShape3D_belly"]
-radius = 0.4
-
-[sub_resource type="SphereShape3D" id="SphereShape3D_hips"]
-radius = 0.3
-
-[node name="Player" type="CharacterBody3D" unique_id=165510044]
-collision_layer = 3
-script = ExtResource("1_xhfnw")
-
-[node name="CollisionChest" type="CollisionShape3D" parent="." unique_id=447032296]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.505, -0.2)
-shape = SubResource("SphereShape3D_chest")
-
-[node name="CollisionBelly" type="CollisionShape3D" parent="." unique_id=571780801]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.505, 0.1)
-shape = SubResource("SphereShape3D_belly")
-
-[node name="CollisionHips" type="CollisionShape3D" parent="." unique_id=717874116]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.505, 0.4)
-shape = SubResource("SphereShape3D_hips")
-
-[node name="Camera3D" type="Camera3D" parent="." unique_id=1120161087]
-script = ExtResource("2_camera_iso")
-
-[node name="bull" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23)
-
-[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 547304299) index="0" unique_id=2096877109]
-bones/0/position = Vector3(0, 0, 0.009963839)
-bones/0/rotation = Quaternion(-0.733504, -0.0036974847, 0.0013620416, -0.67967373)
-bones/0/scale = Vector3(1, 0.99999994, 0.99999994)
-bones/1/position = Vector3(0.0035266252, -0.0043296535, 0.0040827994)
-bones/1/rotation = Quaternion(0.020680686, 0.45675468, 0.8716418, -0.1766016)
-bones/2/rotation = Quaternion(0.3289326, -0.03432299, -0.06047997, 0.94178957)
-bones/4/position = Vector3(0.0045358227, -0.0021376952, -0.004238624)
-bones/4/rotation = Quaternion(-0.2448651, -0.018126775, 0.96885973, -0.0319902)
-bones/4/scale = Vector3(1.0000001, 1, 1.0000001)
-bones/5/rotation = Quaternion(-0.7492961, -0.32333943, -0.24235487, 0.5246629)
-bones/5/scale = Vector3(1, 1, 1)
-bones/6/rotation = Quaternion(0.32210493, 0.15572408, 0.14126852, 0.9230611)
-bones/6/scale = Vector3(0.9999998, 1, 1)
-bones/17/position = Vector3(-2.3283064e-12, 0.0009373817, 0.007552617)
-bones/17/rotation = Quaternion(-5.3357535e-08, 0.7071068, 0.7071067, -5.3357535e-08)
-bones/19/position = Vector3(-0.0035266252, -0.0043296525, 0.0040827994)
-bones/19/rotation = Quaternion(0.07793758, -0.2513099, 0.94914854, 0.1728764)
-bones/20/rotation = Quaternion(-0.3791731, -0.08821739, 0.07153107, 0.91832936)
-bones/22/position = Vector3(-0.0045358227, -0.0021376943, -0.004238624)
-bones/22/rotation = Quaternion(0.20629132, 0.46411392, 0.84344316, 0.17506008)
-bones/22/scale = Vector3(1.0000001, 1.0000001, 1.0000001)
-bones/23/rotation = Quaternion(-0.7287124, 0.31838557, 0.209407, 0.5689971)
-bones/23/scale = Vector3(1.0000001, 1.0000002, 1.0000002)
-bones/24/rotation = Quaternion(0.71033937, -0.13944183, -0.049755, 0.6881123)
-bones/24/scale = Vector3(0.9999999, 1, 1.0000001)
-
-[editable path="bull"]

actors/bear/bear.gd

@@ -26,7 +26,25 @@ var _phase: Phase = Phase.WINDUP
 var _bull: CharacterBody3D = null
 var _skeleton: Skeleton3D = null
 var _anim_player: AnimationPlayer = null
+# Separate player baked into art/fx/bear_fx.glb: each clip scales one FX mesh up from 0
+# and back at its strike frame (self-hiding), so bear.gd just fires the matching clip.
+var _fx_player: AnimationPlayer = null
+var _fx_root: Node = null
+# Shaped attack colliders live in bear_attack_hitboxes.tscn (under bear_model, so they track the
+# bear's facing): a ground-circle cylinder for the leap slam and a forward box lane for the smash.
+# Their sizes AND their travel/pop motion are authored in that scene's AnimationPlayer (clips
+# "leap_slam" / "smash_travel") — scrub them there to tweak. bear.gd only fires the clip, sets the
+# knock-up shaping, activates monitoring, and sweeps for overlaps while the clip runs.
+var _leap_hitbox: Hitbox = null
+var _smash_hitbox: Hitbox = null
+var _hitbox_anim: AnimationPlayer = null
+var _active_hitbox: Hitbox = null
 var _blood_burst: CPUParticles3D = null
+# Bull-ram tracking: the bull's position last frame (to sweep its travel) and whether it was mid-ram
+# last frame (edge-trigger so one charge = one wound, re-arming when the bull breaks off).
+var _bull_prev_pos: Vector3 = Vector3.ZERO
+var _bull_prev_seen: bool = false
+var _bull_ramming: bool = false
 
 var _hp: int = 10
 var _enraged: bool = false
@@ -57,6 +75,11 @@ var _anim_stand: StringName = &""     # IDLE_standing — reared-up wind-up / ro
 var _anim_swipe: StringName = &""     # ONE_TWO_HIT  — double swipe
 var _anim_smash: StringName = &""     # SMASH_HIT    — overhead smash
 var _anim_leap: StringName = &""      # JUMP_SMASH   — leap slam
+var _anim_death: StringName = &""      # DEATH   — death
+
+#take hit flashing
+var _hit_flash_active := false
+var _hit_flash_tween: Tween
 
 const _ACCEL_FACTOR: float = 9.0
 # Hard deceleration for planted states (wind-up / recovery / neutral settle) so the bear
@@ -73,9 +96,10 @@ const _BULL_STANDOFF: float = 1.9
 @onready var _mesh: Node3D = $bear_model
 @onready var _hit_area: Area3D = $HitArea
 var _dust: CPUParticles3D = null
-# Claw-slash bursts bound to the paw bones, fired one per hit of the 1-2 punch.
+
-var _claw_l: CPUParticles3D = null
+
-var _claw_r: CPUParticles3D = null
+
+const RigidSkin = preload("res://systems/render/rigid_skin.gd")
 
 
 func _ready() -> void:
@@ -85,6 +109,18 @@ func _ready() -> void:
 	health_changed.emit(_hp, _hp)
 	_skeleton = _find_skeleton(_mesh)
 	_anim_player = _find_anim_player(_mesh)
+	_fx_root = _mesh.get_node_or_null("Bear_FX")
+	if _fx_root:
+		_fx_player = _fx_root.get_node_or_null("AnimationPlayer") as AnimationPlayer
+		if _fx_player:
+			# The smash/leap clips end held at full scale (Siim only ramped the claw clips back
+			# down), so snap each effect back to 0 when its clip finishes — keeps them one-shot.
+			_fx_player.animation_finished.connect(_on_fx_finished)
+	# Native GPU skinning by default (the Mali/ANGLE invisible-skinning bug is fixed in the 4.7
+	# web templates). The bear is a single dense organic mesh, so the rigid-skin fallback tears
+	# seam holes as it animates — another reason native is the default. See rigid_skin_enabled().
+	if Controls.rigid_skin_enabled():
+		RigidSkin.convert_tree(self)
 	if _anim_player:
 		_anim_idle = _resolve_anim(["IDLE_ON4LEGS", "IDLE"])
 		_anim_run = _resolve_anim(["RUN_ON4LEGS", "RUN"])
@@ -93,29 +129,66 @@ func _ready() -> void:
 		_anim_swipe = _resolve_anim(["ONE_TWO_HIT", "SMASH_HIT"])
 		_anim_smash = _resolve_anim(["SMASH_HIT", "ONE_TWO_HIT"])
 		_anim_leap = _resolve_anim(["JUMP_SMASH", "SMASH_HIT"])
+		_anim_death = _resolve_anim(["DEATH"])
 		# Loop the locomotion / idle clips; the attack clips (swipe/smash/leap) are one-shot,
 		# so their on-ground settle frames play once and then hold instead of looping.
 		for a in [_anim_idle, _anim_run, _anim_walk2, _anim_stand]:
 			_ensure_loop(a)
-		for a in [_anim_swipe, _anim_smash, _anim_leap]:
+		for a in [_anim_swipe, _anim_smash, _anim_leap, _anim_death]:
 			_set_no_loop(a)
 		_anim_player.playback_default_blend_time = 0.12
-	_hit_area.body_entered.connect(_on_body_entered)
+	_blood_burst = preload("res://systems/fx/blood_burst.gd").new()
-	_blood_burst = preload("res://blood_burst.gd").new()
 	add_child(_blood_burst)
-	_dust = _make_slam_dust()
 	add_child(_dust)
 	_setup_claws()
+	_setup_attack_hitboxes()
 	_enter_neutral()
 
+#take hit flashing
+func _hit_flash() -> void:
+	if _mesh == null:
+		return
+
+	if _hit_flash_tween:
+		_hit_flash_tween.kill()
+
+	_hit_flash_active = true
+
+	# Make the bear red
+	for child in _mesh.find_children("*", "MeshInstance3D", true, false):
+		var mesh := child as MeshInstance3D
+		if mesh:
+			mesh.material_overlay = _make_hit_overlay()
+
+	# Flash for 0.1 sec, then remove
+	_hit_flash_tween = create_tween()
+	_hit_flash_tween.tween_interval(0.10)
+	_hit_flash_tween.tween_callback(_clear_hit_flash)
+
+func _make_hit_overlay() -> StandardMaterial3D:
+	var mat := StandardMaterial3D.new()
+	mat.albedo_color = Color(1.0, 0.05, 0.05, 1.0)
+	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+	return mat
+
+func _clear_hit_flash() -> void:
+	if _mesh == null:
+		return
+
+	for child in _mesh.find_children("*", "MeshInstance3D", true, false):
+		var mesh := child as MeshInstance3D
+		if mesh:
+			mesh.material_overlay = null
+
+	_hit_flash_active = false
+
+
 
 # Bind a claw-slash emitter to each paw bone (hand_l / hand_r) via a BoneAttachment3D, so
 # a burst fired on a swipe hit erupts from that paw wherever the animation has it.
 func _setup_claws() -> void:
 	if _skeleton == null:
 		return
-	_claw_r = _attach_claw("hand_r")
-	_claw_l = _attach_claw("hand_l")
 
 
 func _attach_claw(bone: String) -> CPUParticles3D:
@@ -164,6 +237,9 @@ func _physics_process(delta: float) -> void:
 	_acquire_bull()
 	_update_enrage()
 	_stagger_cd = maxf(0.0, _stagger_cd - delta)
+	_tick_attack_hitbox()
+	if _bull != null:
+		_sweep_bull_ram()
 
 	match _state:
 		State.NEUTRAL: _tick_neutral(delta)
@@ -233,15 +309,19 @@ func _decide() -> void:
 
 	var dist := _flat_dist_to_bull()
 	var options: Array
+
 	if dist <= DP.f("bear_close_range"):
-		# In strike range: punch or overhead (both step in during the swing).
+		# Short range: claw attack
-		options = [[State.SWIPE, 3.0], [State.SMASH, 3.0 if _enraged else 2.5]]
+		options = [[State.SWIPE, 3.0]]
-	elif dist <= DP.f("bear_mid_range"):
+
-		# Mid: mostly walk the bull down on two legs; occasionally leap the gap.
-		options = [[State.STALK, 3.0], [State.LEAP, 2.0 if _enraged else 1.5]]
 	else:
-		# Far: lope in on all fours, or spring across with a leap.
+		# At distance: overhead smash 1/3 of the time, jump smash 2/3 — both close the gap as
-		options = [[State.PROWL, 3.0], [State.LEAP, 1.5]]
+		# they land, so the bear slams its way in rather than walking (stalk/prowl).
+		options = [
+			[State.SMASH, 1.0],
+			[State.LEAP, 2.0]
+		]
+
 	_start_routine(_weighted_pick(options))
 
 
@@ -250,12 +330,21 @@ func _decide() -> void:
 func _range_allows(routine: State) -> bool:
 	if _bull == null:
 		return routine == State.PROWL
+
 	var dist := _flat_dist_to_bull()
+
 	match routine:
-		State.SWIPE, State.SMASH:
+		State.SWIPE:
 			return dist <= DP.f("bear_close_range") * 1.4
+
 		State.LEAP:
 			return dist <= DP.f("bear_mid_range") * 1.5
+
+		State.SMASH:
+			# Smash can be started from any distance.
+			# The attack itself will move toward the bull.
+			return true
+
 	return true
 
 
@@ -342,12 +431,12 @@ func _tick_swipe(delta: float) -> void:
 			var frac := 1.0 - _phase_timer / maxf(_active_len, 0.001)
 			if _hits_done == 0 and frac >= 0.25:
 				_hits_done = 1
+				_play_fx(_claw_fx_clip(0))
 				_try_hit(DP.f("bear_swipe_reach"))
-				_claw_slash(true)   # first paw (right) rakes across
 			elif _hits_done == 1 and frac >= 0.65:
 				_hits_done = 2
+				_play_fx(_claw_fx_clip(1))
 				_try_hit(DP.f("bear_swipe_reach"))
-				_claw_slash(false)  # back-hand with the left paw
 			if _phase_timer <= 0.0:
 				_begin_recover(DP.f("bear_swipe_recover"))
 		Phase.RECOVER:
@@ -374,13 +463,16 @@ func _tick_smash(delta: float) -> void:
 			if _phase_timer <= 0.0:
 				_begin_attack_active(_anim_smash, 0.9)
 		Phase.ACTIVE:
-			# The overhead steps in less than the swipe — it's a commitment, not a rush.
+			# The overhead steps in less than the swipe — it's a commitment, not a rush. no rotation
-			_lunge_and_track(DP.f("bear_lunge_speed") * 0.5, delta)
+			_lunge_and_track_no_rotation(DP.f("bear_lunge_speed") * 0.5, delta)
 			_phase_timer -= delta
 			var frac := 1.0 - _phase_timer / maxf(_active_len, 0.001)
 			if _hits_done == 0 and frac >= 0.4:
 				_hits_done = 1
-				_slam(DP.f("bear_smash_radius"), 0.8)
+				_play_fx(&"Bear_fx_smash_hit")
+				_slam_dust()
+				_shake(0.8)
+				_begin_smash_hitbox()   # plays the scene's "smash_travel" clip; swept in _tick_attack_hitbox
 			if _phase_timer <= 0.0:
 				_begin_recover(DP.f("bear_smash_recover"))
 		Phase.RECOVER:
@@ -431,7 +523,8 @@ func _tick_leap(delta: float) -> void:
 			elif _leap_airborne or _phase_timer <= 0.0:
 				velocity.x = 0.0
 				velocity.z = 0.0
-				_slam(DP.f("bear_slam_radius"), 0.7)
+				_play_fx(&"Bear_fx_jump_smash")
+				_fire_leap_hitbox()
 				_phase = Phase.RECOVER
 				_phase_timer = _scaled(DP.f("bear_leap_recover"))
 		Phase.RECOVER:
@@ -509,6 +602,20 @@ func _lunge_and_track(speed: float, delta: float) -> void:
 		_decelerate(_PLANT_DECEL, delta)
 
 
+func _lunge_and_track_no_rotation(speed: float, delta: float) -> void:
+	if _bull == null:
+		_decelerate(_PLANT_DECEL, delta)
+		return
+
+	var to_bull := _flat_to_bull()
+	var dist := to_bull.length()
+
+	if speed > 0.0 and dist > _BULL_STANDOFF:
+		_accelerate(to_bull / dist, speed, delta)
+	else:
+		_decelerate(_PLANT_DECEL, delta)
+
+
 # ── Hitting the bull ───────────────────────────────────────────────────────────────
 
 # Directional strike: the bull is mauled inside `reach` of the bear that's facing it
@@ -523,22 +630,88 @@ func _try_hit(reach: float) -> bool:
 		return false
 	if _facing().dot(to_bull / dist) < cos(deg_to_rad(DP.f("bear_hit_arc"))):
 		return false
-	_bull.call(&"take_sword_hit", "mauled")
+	DamageEvent.deal(_bull, DamageEvent.Cause.MAULED, _bull.global_position, self)
 	_shake(0.55)
 	return true
 
 
-# Radial slam (smash / leap landing): hits any way the bull is, within `radius`, with a
+# Grab the designer-authored collider sub-scene (bear_attack_hitboxes.tscn instanced under
-# ground-pound shake and a burst of dust kicked up at the paws. No facing arc — you're
+# bear_model) and park both hitboxes deactivated. Shapes + travel are authored in that scene.
-# caught if you're near where it comes down.
+func _setup_attack_hitboxes() -> void:
-func _slam(radius: float, shake: float) -> void:
+	var root := _mesh.get_node_or_null("AttackHitboxes") if _mesh else null
-	_slam_dust()
+	if root == null:
-	if _bull == null:
-		_shake(shake)
 		return
-	if _flat_dist_to_bull() <= radius:
+	_leap_hitbox = root.get_node_or_null("LeapSlamHitbox") as Hitbox
-		_bull.call(&"take_sword_hit", "mauled")
+	_smash_hitbox = root.get_node_or_null("SmashHitbox") as Hitbox
-	_shake(shake)
+	_hitbox_anim = root.get_node_or_null("AnimationPlayer") as AnimationPlayer
+	if _hitbox_anim != null:
+		# Advance the shape's travel in the physics step so it stays in lockstep with the sweep.
+		_hitbox_anim.callback_mode_process = AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_PHYSICS
+	if _leap_hitbox != null:
+		_leap_hitbox.deactivate()
+	if _smash_hitbox != null:
+		_smash_hitbox.deactivate()
+
+
+# Leap landing: kick up dust + shake, launch the ground-circle collider clip, and arm it so the bull
+# is launched from ANYWHERE in the circle (bear_leap_ring_frac 0). Raise ring_frac to restore a
+# grounded inner zone that only mauls; the launch zone then starts at that fraction of the radius.
+func _fire_leap_hitbox() -> void:
+	_slam_dust()
+	_shake(0.7)
+	if _leap_hitbox == null:
+		return
+	_leap_hitbox.knock_up = DP.f("bear_leap_knockup")
+	_leap_hitbox.knock_up_min_dist = DP.f("bear_leap_ring_frac") * _shape_extent(_leap_hitbox, true)
+	_leap_hitbox.knock_up_max_dist = 0.0   # binary: full-height launch everywhere it launches
+	_start_attack_hitbox(_leap_hitbox, &"leap_slam")
+
+
+# Overhead smash: launch the lane clip; knock-up ramps 0→full with distance (further = higher),
+# maxing at the lane's authored full length so the shape and the launch curve stay in sync.
+func _begin_smash_hitbox() -> void:
+	if _smash_hitbox == null:
+		return
+	_smash_hitbox.knock_up = DP.f("bear_smash_knockup")
+	_smash_hitbox.knock_up_min_dist = 0.0
+	_smash_hitbox.knock_up_max_dist = _shape_extent(_smash_hitbox, false)
+	_start_attack_hitbox(_smash_hitbox, &"smash_travel")
+
+
+# Activate the hitbox and play its authored motion clip; _tick_attack_hitbox sweeps for overlaps
+# each frame while the clip runs, then deactivates when it ends.
+func _start_attack_hitbox(hb: Hitbox, clip: StringName) -> void:
+	if _active_hitbox != null and _active_hitbox != hb:
+		_active_hitbox.deactivate()
+	hb.activate()
+	_active_hitbox = hb
+	if _hitbox_anim != null and _hitbox_anim.has_animation(clip):
+		_hitbox_anim.play(clip)
+		_hitbox_anim.seek(0.0, true)
+
+
+func _tick_attack_hitbox() -> void:
+	if _active_hitbox == null:
+		return
+	_active_hitbox.sweep()
+	# The clip drives the shape's travel; when it stops, the swing is over — close the hitbox.
+	if _hitbox_anim == null or not _hitbox_anim.is_playing():
+		_active_hitbox.deactivate()
+		_active_hitbox = null
+
+
+# Full extent (planar) of a hitbox's authored shape, for the knock-up distance math: the circle's
+# radius (cylinder) or the lane's length (box half-size along local +Z, forward from the bear).
+func _shape_extent(hb: Hitbox, radial: bool) -> float:
+	var cs := hb.get_node_or_null("CollisionShape3D") as CollisionShape3D
+	if cs == null:
+		return 0.0
+	if radial and cs.shape is CylinderShape3D:
+		return (cs.shape as CylinderShape3D).radius
+	if not radial and cs.shape is BoxShape3D:
+		# Box spans [0, size.z] because it's offset forward by half its length.
+		return (cs.shape as BoxShape3D).size.z
+	return 0.0
 
 
 # Kick up a one-shot ring of dust at the bear's feet where the slam lands.
@@ -599,15 +772,6 @@ func _make_slam_dust() -> CPUParticles3D:
 	return p
 
 
-# Fire the claw-slash burst on one paw for a swipe hit (right paw first, then left).
-func _claw_slash(right: bool) -> void:
-	var claw := _claw_r if right else _claw_l
-	if claw == null:
-		return
-	claw.restart()
-	claw.emitting = true
-
-
 # A short fan of pale streaks raked from a paw — thin boxes aligned to their velocity so
 # they read as claw marks slashing outward. Built in code and parented to a hand bone.
 func _make_claw_slash() -> CPUParticles3D:
@@ -671,24 +835,51 @@ func apply_ability_hit(hit_dir: Vector3, strength: float, _up_boost: float = 0.0
 	_take_hit(hit_dir, strength)
 
 
-# Ramming: only a real charge from the bull wounds the bear; a gentle nudge is shrugged
+# Only a horns-first charge wounds the bear. Swept (prev → now) so a tunnelling or point-blank charge
-# off. The bear never damages the bull by colliding — only its swings/slams do.
+# still lands where body_entered wouldn't; edge-triggered (_bull_ramming) so one charge = one wound.
-func _on_body_entered(body: Node3D) -> void:
+func _sweep_bull_ram() -> void:
-	if _state == State.DEAD or not body.is_in_group(&"player"):
+	var now := _bull.global_position
+	var seg_from := _bull_prev_pos if _bull_prev_seen else now
+	_bull_prev_pos = now
+	_bull_prev_seen = true
+	if _state == State.DEAD:
+		_bull_ramming = false
 		return
-	var player := body as CharacterBody3D
+	var vel := Vector3(_bull.velocity.x, 0.0, _bull.velocity.z)
-	if player.velocity.length() < DP.f("bear_hit_threshold"):
+	var speed := vel.length()
-		return
+	var ramming := false
-	var flat := Vector3(player.velocity.x, 0.0, player.velocity.z)
+	if speed >= DP.f("bear_hit_threshold") and _horns_first(seg_from):
-	var dir := flat.normalized() if flat.length() > 0.5 else \
+		var a := Vector3(seg_from.x, 0.0, seg_from.z)
-		(global_position - player.global_position).normalized()
+		var b := Vector3(now.x, 0.0, now.z)
-	_take_hit(dir, player.velocity.length())
+		var p := Vector3(global_position.x, 0.0, global_position.z)
+		if p.distance_to(Geometry3D.get_closest_point_to_segment(p, a, b)) <= DP.f("bear_ram_reach"):
+			ramming = true
+	if ramming and not _bull_ramming:
+		var dir := vel.normalized() if speed > 0.5 else (global_position - now).normalized()
+		_take_hit(dir, speed)
+	_bull_ramming = ramming
+
+
+# Horns-first gate: wound only when the bull's velocity points within bull_gore_arc of the direction
+# from `from` to the bear. The dash ability skips the gate.
+func _horns_first(from: Vector3) -> bool:
+	if _bull.has_method(&"is_dashing") and _bull.call(&"is_dashing"):
+		return true   # the dash ability is a committed lunge — it rams on contact, no angle gate
+	var vel := Vector3(_bull.velocity.x, 0.0, _bull.velocity.z)
+	if vel.length() < 0.5:
+		return false
+	var to_bear := global_position - from
+	to_bear.y = 0.0
+	if to_bear.length() < 0.01:
+		return true
+	return vel.normalized().dot(to_bear.normalized()) > cos(deg_to_rad(DP.f("bull_gore_arc")))
 
 
 func _take_hit(hit_dir: Vector3, strength: float) -> void:
 	if _state == State.DEAD:
 		return
 	_hp -= 1
+	_hit_flash()
 	health_changed.emit(_hp, int(DP.f("bear_max_hp")))
 	hit_dir.y = 0.0
 	hit_dir = hit_dir.normalized()
@@ -728,19 +919,7 @@ func _die(hit_dir: Vector3) -> void:
 		_hit_area.monitoring = false
 	velocity = Vector3.ZERO
 	_blood_burst.burst(global_position + Vector3(0.0, 1.4, 0.0), hit_dir)
-	_play(_anim_idle)
+	_play(_anim_death)
-	# No death clip on the rig — topple the beast onto its side (about the hit direction,
-	# so it falls the way it was struck) and sink it away, then free.
-	var fall_axis := Vector3(-hit_dir.z, 0.0, hit_dir.x)
-	if fall_axis.length() < 0.01:
-		fall_axis = Vector3.RIGHT
-	var tween := create_tween()
-	tween.tween_property(_mesh, "rotation",
-		_mesh.rotation + fall_axis.normalized() * deg_to_rad(88.0), 0.7)\
-		.set_trans(Tween.TRANS_QUAD).set_ease(Tween.EASE_IN)
-	tween.tween_interval(2.5)
-	tween.tween_property(_mesh, "position:y", _mesh.position.y - 3.0, 1.0)
-	tween.tween_callback(queue_free)
 
 
 # ── Interface shared with the matador (guarded elsewhere via has_method) ─────────────
@@ -854,6 +1033,43 @@ func _play(anim_name: StringName) -> void:
 	_anim_player.play(anim_name)
 
 
+# The two swipe hits map to the L/R claw-slash clips; bear_fx_claw_swap flips the order in
+# case the baked left/right clips read reversed in-game. hit 0 = first swing, 1 = second.
+func _claw_fx_clip(hit: int) -> StringName:
+	var swap := DP.f("bear_fx_claw_swap") >= 0.5
+	var first_left := not swap
+	if (hit == 0) == first_left:
+		return &"Bear_fx_claw_attack_L"
+	return &"Bear_fx_claw_attack_R"
+
+
+# Fire a one-shot FX clip from the Bear_FX glb (crater / slash / debris). Each clip scales
+# its mesh up at the strike and back to 0 on its own, so this is a plain fire-and-forget.
+func _play_fx(clip: StringName) -> void:
+	if _fx_player == null or not _fx_player.has_animation(clip):
+		return
+	if _fx_root is Node3D:
+		(_fx_root as Node3D).rotation.y = deg_to_rad(DP.f("bear_fx_yaw"))
+	_fx_player.play(clip)
+	_fx_player.seek(0.0, true)
+
+
+func _on_fx_finished(anim: StringName) -> void:
+	if _fx_root == null:
+		return
+	var mesh := _fx_root.get_node_or_null(NodePath(anim)) as Node3D
+	if mesh == null:
+		return
+	# The crater clip only ramps up (it ends held at full scale with no shrink), so leave it on
+	# the ground for a beat after the slam, then hide it. The others self-clear immediately.
+	if anim == &"Bear_fx_jump_smash":
+		var linger := DP.f("bear_fx_crater_linger")
+		if linger > 0.0:
+			get_tree().create_timer(linger).timeout.connect(func() -> void: mesh.scale = Vector3.ZERO)
+			return
+	mesh.scale = Vector3.ZERO
+
+
 # Restart a one-shot attack clip from its first frame at `speed` (even if already current).
 func _play_attack(anim_name: StringName, speed: float) -> void:
 	if _anim_player == null or anim_name == &"":

actors/bear/bear.tscn

@@ -0,0 +1,44 @@
+[gd_scene format=3 uid="uid://o8ocjfprxa7u"]
+
+[ext_resource type="Script" uid="uid://cn7fhjkro7637" path="res://actors/bear/bear.gd" id="1_beargd"]
+[ext_resource type="PackedScene" uid="uid://cofv5dbavesis" path="res://art/characters/bear.glb" id="2_bearglb"]
+[ext_resource type="PackedScene" uid="uid://bdbx0wwa73rhp" path="res://art/fx/bear_fx.glb" id="3_bearfx"]
+[ext_resource type="Material" uid="uid://blpkmyikjnhbo" path="res://art/materials/bear_claw_fx.tres" id="4_clawfx"]
+[ext_resource type="PackedScene" path="res://actors/bear/bear_attack_hitboxes.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"]

actors/bear/bear_attack_hitboxes.tscn

@@ -0,0 +1,70 @@
+[gd_scene format=3]
+
+[ext_resource type="Script" path="res://systems/combat/hitbox.gd" id="1_qxn4a"]
+
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_6dow8"]
+height = 3.0
+radius = 4.0
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_tmmfg"]
+size = Vector3(2.6, 2.5, 20)
+
+[sub_resource type="Animation" id="Animation_wcwtv"]
+length = 0.25
+tracks/0/type = "scale_3d"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("LeapSlamHitbox/CollisionShape3D")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = PackedFloat32Array(0, 1, 0.12, 1, 0.12, 0.06, 1, 1, 1, 1, 0.25, 1, 1, 1, 1)
+
+[sub_resource type="Animation" id="Animation_bg5u7"]
+length = 0.3
+tracks/0/type = "scale_3d"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("SmashHitbox/CollisionShape3D")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = PackedFloat32Array(0, 1, 1, 1, 0.02, 0.1, 1, 1, 1, 1, 0.3, 1, 1, 1, 1)
+tracks/1/type = "position_3d"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("SmashHitbox/CollisionShape3D")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = PackedFloat32Array(0, 1, 0, 0.9, 0.2, 0.1, 1, 0, 0.9, 10, 0.3, 1, 0, 0.9, 10)
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_u1id2"]
+_data = {
+&"leap_slam": SubResource("Animation_wcwtv"),
+&"smash_travel": SubResource("Animation_bg5u7")
+}
+
+[node name="AttackHitboxes" type="Node3D" unique_id=2010404706]
+
+[node name="LeapSlamHitbox" type="Area3D" parent="." unique_id=1751893032]
+collision_layer = 0
+collision_mask = 2
+monitoring = false
+monitorable = false
+script = ExtResource("1_qxn4a")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="LeapSlamHitbox" unique_id=1320172052]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
+shape = SubResource("CylinderShape3D_6dow8")
+
+[node name="SmashHitbox" type="Area3D" parent="." unique_id=1579648726]
+collision_layer = 0
+collision_mask = 2
+monitoring = false
+monitorable = false
+script = ExtResource("1_qxn4a")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="SmashHitbox" unique_id=528637962]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 10)
+shape = SubResource("BoxShape3D_tmmfg")
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=2139876757]
+libraries/ = SubResource("AnimationLibrary_u1id2")

actors/matador/matador.gd

@@ -1,13 +1,9 @@
 extends CharacterBody3D
 
-# WANDER  → bull outside flee range, roaming freely
+# WANDER → roam/taunt outside flee range.  FLEE → bull close: back away (raycast-steered).
-# FLEE    → bull within range, matador backs away (raycast-steered around walls)
+# BRACE → charge detected: plant + face (cite).  SIDESTEP → bull commits: lateral pass (pase).
-# BRACE   → charge detected: plant feet, face the bull (cite phase)
+# ATTACK → chase and strike.  ROLL → hit but rolled: survive.  THROW → wind up + hurl the spear.
-# SIDESTEP→ bull commits: sharp lateral step to let it pass (pase phase)
+# RAGDOLL → hit, no roll.
-# ATTACK  → post-dodge or mid-range: chase and strike
-# ROLL    → hit by bull but roll chance fires: survive and recover
-# THROW   → planted, winding up an overhand throw, then releasing the sword
-# RAGDOLL → hit by bull, no roll chance
 enum State { WANDER, FLEE, BRACE, SIDESTEP, ATTACK, ROLL, THROW, RAGDOLL }
 
 # The matador's high-level *want*, chosen by a weighted utility vote (see
@@ -32,7 +28,9 @@ var _dodge_cd:      float                   = 0.0
 var _will_dodge:    bool                    = true
 var _attack_timer:  float                   = 0.0
 var _swing_timer:   float                   = 0.0
-var _lunge_timer:   float                   = 0.0
+var _attack_cd:     float                   = 0.0
+var _bull_prev_pos: Vector3                 = Vector3.ZERO
+var _bull_prev_seen: bool                   = false
 var _roll_timer:    float                   = 0.0
 var _roll_dir:      Vector3                 = Vector3.ZERO
 var _is_spawning:   bool                    = false
@@ -52,7 +50,7 @@ var _drawing:       bool                    = false
 var _sheathing:     bool                    = false
 var _draw_timer:    float                   = 0.0
 var _draw_len:      float                   = 0.0
-var _sword_blade_area: Area3D               = null
+var _sword_blade_area: Hitbox               = null
 var _spear_node:    Node3D                  = null
 var _blade_hit_cd:  float                   = 0.0
 var _death_player:  AudioStreamPlayer       = null
@@ -61,6 +59,7 @@ var _blood_burst:   CPUParticles3D          = null
 @onready var _mesh:      Node3D           = $matador2
 @onready var _hit_area:  Area3D           = $HitArea
 
+
 const _ANIM_RUN:    StringName = &"Run"
 const _ANIM_IDLE:   StringName = &"Taunt"
 const _ANIM_ATTACK: StringName = &"Attack"
@@ -75,8 +74,9 @@ const _ANIM_TAUNTS: Array[StringName] = [&"Taunt", &"Taunt_B", &"Taunt_C"]
 # reparents from holster to hand at this point in the animation.
 const _DRAW_GRAB_AT: float = 0.55
 
-const _SWORD_SCENE: PackedScene = preload("res://Assets/sword.glb")
+# Wrapper scenes (glb + an editor-tweakable hitbox / collider) — see sword.tscn / spear.tscn.
-const _SPEAR_SCENE: PackedScene = preload("res://Assets/spear.glb")
+const _SWORD_SCENE: PackedScene = preload("res://actors/matador/sword.tscn")
+const _SPEAR_SCENE: PackedScene = preload("res://actors/matador/spear.tscn")
 
 const _GRAVITY: float = 9.8           # arena gravity, for the spear's ballistic arc
 
@@ -93,12 +93,20 @@ const _TURN_FACE:    float = 16.0   # face the bull while engaging
 const _TURN_SHARP:   float = 24.0   # snap onto a sidestep / roll direction
 
 
+const RigidSkin = preload("res://systems/render/rigid_skin.gd")
+
+
 func _ready() -> void:
 	add_to_group(&"matador")
 	_skeleton = _find_skeleton(_mesh)
 	_anim_player = _find_anim_player(_mesh)
 	if _skeleton:
 		_sim = MatadorRagdoll.build(_skeleton)
+	# Native GPU skinning by default; rigid_skin is an opt-in fallback now (the Mali/ANGLE
+	# invisible-skinning bug is fixed in the 4.7 web templates). See Controls.rigid_skin_enabled().
+	# When on, it runs after the ragdoll sim is built (both drive the same bones).
+	if Controls.rigid_skin_enabled():
+		RigidSkin.convert_tree(self)
 	if _anim_player:
 		for anim in [_ANIM_RUN, _ANIM_ATTACK] + _ANIM_TAUNTS:
 			_ensure_loop(anim)
@@ -113,7 +121,7 @@ func _ready() -> void:
 	_throw_aim_cd = randf_range(2.0, 5.0)
 	_hit_area.body_entered.connect(_on_body_entered)
 	_pick_wander_target()
-	_blood_burst = preload("res://blood_burst.gd").new()
+	_blood_burst = preload("res://systems/fx/blood_burst.gd").new()
 	add_child(_blood_burst)
 	if ResourceLoader.exists("res://sounds/ole.ogg"):
 		_ole_player = AudioStreamPlayer.new()
@@ -160,6 +168,9 @@ func _physics_process(delta: float) -> void:
 	_dodge_cd      = maxf(0.0, _dodge_cd - delta)
 	_blade_hit_cd  = maxf(0.0, _blade_hit_cd - delta)
 	_throw_aim_cd  = maxf(0.0, _throw_aim_cd - delta)
+	_attack_cd     = maxf(0.0, _attack_cd - delta)
+	if _bull != null:
+		_sweep_bull_gore()
 	if _state != State.RAGDOLL and _bull != null:
 		_update_ai_state(delta)
 
@@ -177,9 +188,8 @@ func _physics_process(delta: float) -> void:
 	_advance_draw(delta)
 
 
-# Utility-driven brain. The physically committed states (a brace, a pass, a roll, a
+# Utility-driven brain. Committed states (brace / pass / roll / throw wind-up) run to completion on
-# throw wind-up) run to completion on their own timers; from the free states the
+# their own timers; from the free states the matador re-scores every mat_decide_interval.
-# matador re-scores its options every mat_decide_interval and acts on the winner.
 func _update_ai_state(delta: float) -> void:
 	if _state == State.BRACE or _state == State.SIDESTEP \
 			or _state == State.ROLL or _state == State.THROW:
@@ -196,9 +206,8 @@ func _update_ai_state(delta: float) -> void:
 		_enter_intent(intent)
 
 
-# Score each intent from weighted heuristics and return the winner. Weights (the
+# Score each intent from weighted mat_w_* heuristics and return the winner; a small commit bonus on
-# mat_w_* params) shape the personality; a small commit bonus on the current intent
+# the current intent stops it flip-flopping between two near-tied options.
-# stops it flip-flopping between two near-tied options.
 func _choose_intent() -> Intent:
 	var dist := global_position.distance_to(_bull.global_position)
 	var bull_flat := Vector3(_bull.velocity.x, 0.0, _bull.velocity.z)
@@ -219,6 +228,9 @@ func _choose_intent() -> Intent:
 	# A matador won't commit to a strike it can't bail out of, so a spent dodge
 	# cooldown makes attacking (and dodging outright) less attractive.
 	var dodge_ready := 1.0 if _dodge_cd <= 0.0 else 0.35
+	# The post-stab recovery beat (mat_stab_recovery) kills ATTACK outright — the matador circles
+	# or gives ground between thrusts rather than machine-gunning the bull; DODGE/FLEE stay live.
+	var attack_ready := 0.0 if _attack_cd > 0.0 else 1.0
 	var throw_ok := _throw_aim_cd <= 0.0 and is_instance_valid(_sword_node) \
 		and dist >= DP.f("mat_throw_min_dist") and dist <= DP.f("mat_throw_range")
 
@@ -239,7 +251,7 @@ func _choose_intent() -> Intent:
 		# Press the attack; ease off a touch when a charge is barrelling in. Supporting
 		# matadors barely press — they yield the pass to whoever's engaging.
 		Intent.ATTACK: DP.f("mat_w_aggression") * (0.45 + 0.55 * close) \
-			* (1.0 - 0.55 * danger) * dodge_ready * engage_mult,
+			* (1.0 - 0.55 * danger) * dodge_ready * engage_mult * attack_ready,
 		# Sidestep / plant against an incoming charge.
 		Intent.DODGE:  DP.f("mat_w_caution") * danger * (1.0 if _dodge_cd <= 0.0 else 0.0),
 		# Hurl the blade — an occasional ranged flourish from an engaging matador when
@@ -247,7 +259,10 @@ func _choose_intent() -> Intent:
 		Intent.THROW:  (DP.f("mat_w_throw") * (0.35 + 0.65 * (1.0 - close))) \
 			if (throw_ok and is_engager) else -1.0,
 	}
-	score[_intent] = float(score[_intent]) + DP.f("mat_w_commit")
+	# Commit bonus keeps a near-tied choice from flip-flopping — but don't re-reinforce a
+	# just-swung ATTACK we're recovering from, or the matador clings to it and spams the bull.
+	if not (_intent == Intent.ATTACK and _attack_cd > 0.0):
+		score[_intent] = float(score[_intent]) + DP.f("mat_w_commit")
 
 	var best: Intent = Intent.WANDER
 	var best_score := -INF
@@ -293,9 +308,8 @@ func _enter_intent(intent: Intent) -> void:
 			_start_throw()
 
 
-# How many other live matadors are closer to the bull than this one. 0 = the
+# How many other live matadors are closer to the bull than this one (0 = the lead engager); the
-# closest (the natural lead engager); the utility brain gives the nearest
+# brain lets the nearest mat_engage_slots press while the rest spread out and taunt.
-# mat_engage_slots the go-ahead to press while the rest spread out and taunt.
 func _engagement_rank() -> int:
 	if _bull == null:
 		return 0
@@ -339,6 +353,19 @@ func _is_charge_incoming() -> bool:
 	return bull_flat.normalized().dot(to_me.normalized()) > 0.85
 
 
+# Bull charging fast and aimed straight at the matador, at ANY range (unlike _is_charge_incoming,
+# which is capped to brace range) — so a taunting matador can answer a charge from across the arena.
+func _charge_aimed_at_me() -> bool:
+	var bull_flat := Vector3(_bull.velocity.x, 0.0, _bull.velocity.z)
+	if bull_flat.length() < DP.f("mat_charge_speed"):
+		return false
+	var to_me := global_position - _bull.global_position
+	to_me.y = 0.0
+	if to_me.length() < 0.1:
+		return true
+	return bull_flat.normalized().dot(to_me.normalized()) > 0.9
+
+
 # Returns a wall-clear direction, recomputed at most every _STEER_INTERVAL seconds.
 # Randomises among available clear angles so juke direction is unpredictable.
 func _steer_clear(desired_dir: Vector3, delta: float) -> Vector3:
@@ -399,6 +426,19 @@ func _face_point(point: Vector3, delta: float, rate: float) -> void:
 func _tick_wander(delta: float) -> void:
 	# Plant the feet while drawing / sheathing instead of sliding through the clip.
 	if _drawing or _sheathing or _idle_timer > 0.0:
+		# A charge aimed at a taunting matador snaps it out of the pose: hurl a spear at a bull
+		# barrelling in from range, or switch to the sword (brace/cite) to meet a closer rush.
+		if _idle_timer > 0.0 and not _drawing and not _sheathing \
+				and _bull != null and _charge_aimed_at_me():
+			var dist := global_position.distance_to(_bull.global_position)
+			var throw_ok := _throw_aim_cd <= 0.0 and is_instance_valid(_sword_node) \
+				and dist >= DP.f("mat_throw_min_dist") and dist <= DP.f("mat_throw_range")
+			if dist > DP.f("mat_brace_range") and throw_ok:
+				_start_throw()          # far charge — get the spear off before it arrives
+				return
+			if dist <= DP.f("mat_brace_range"):
+				_start_brace()          # closer rush — draw the sword and cite the charge
+				return
 		_idle_timer = maxf(0.0, _idle_timer - delta)
 		_decelerate(10.0, delta)
 		# Taunt toward the bull so the posturing plays to it, not off into space.
@@ -523,6 +563,7 @@ func _start_attack() -> void:
 
 func _tick_attack(delta: float) -> void:
 	_attack_timer -= delta
+	var was_swinging := _swing_timer > 0.0
 	_swing_timer = maxf(0.0, _swing_timer - delta)
 	# Plant the feet while drawing instead of sliding toward the bull mid-clip.
 	if _drawing or _sheathing:
@@ -535,22 +576,41 @@ func _tick_attack(delta: float) -> void:
 	to_bull.y = 0.0
 	var dist := to_bull.length()
 
-	# Commit to a full swing once in range instead of flipping Run/Attack at the
+	# A finished stab enforces a recovery beat (no re-commit for mat_stab_recovery), then decides
-	# distance boundary every frame (the old foot-slide jitter). When the swing
+	# what's next: a landed hit very likely breaks into a taunt/retreat, otherwise the usual roll
-	# ends the matador re-closes if the bull slipped away, or stabs again if not.
+	# to give ground / circle / throw — anything but instantly drilling the same thrust again.
-	if _swing_timer <= 0.0 and dist <= DP.f("mat_attack_min_dist") and _sword_in_hand:
+	if was_swinging and _swing_timer <= 0.0:
+		_attack_cd = DP.f("mat_stab_recovery")
+		var landed := _sword_blade_area != null and _sword_blade_area.did_hit()
+		if landed and randf() < DP.f("mat_taunt_after_hit"):
+			_do_taunt_retreat()
+			return
+		if randf() < DP.f("mat_stab_followup_chance"):
+			_do_stab_followup()
+			return
+
+	# Run in (Run clip) to mat_stab_standoff, then plant and swing on the spot — the standoff sits
+	# inside the sword's ~3.75 m thrust reach; killing velocity on commit stops the feet sliding.
+	# The recovery beat gates the next commit so back-to-back stabs can't machine-gun the bull.
+	if _swing_timer <= 0.0 and _attack_cd <= 0.0 and dist <= DP.f("mat_stab_standoff") and _sword_in_hand:
 		_swing_timer = _anim_length(_ANIM_ATTACK, 0.9)
-		_lunge_timer = DP.f("mat_lunge_time")
+		velocity.x = 0.0
+		velocity.z = 0.0
+		# Re-arm fresh each swing — back-to-back stabs commit before the else-branch deactivate runs.
+		if _sword_blade_area != null:
+			_sword_blade_area.deactivate()
 
 	if _swing_timer > 0.0:
-		_lunge_timer = maxf(0.0, _lunge_timer - delta)
+		_decelerate(22.0, delta)
-		if _lunge_timer > 0.0 and dist > 0.1:
-			_accelerate(to_bull.normalized(), DP.f("mat_lunge_speed"), delta)
-		else:
-			_decelerate(22.0, delta)
 		_play_anim(_ANIM_ATTACK)
-		_try_melee_hit(DP.f("mat_stab_reach"))
+		# Damage off the sword's own BladeHitbox (sword.tscn), riding the animated blade — gored only
+		# when the thrust reaches it. Arm at the thrust (mat_stab_strike_at) and sweep for the overlap.
+		if _sword_blade_area != null and _swing_phase() >= DP.f("mat_stab_strike_at"):
+			_sword_blade_area.activate()
+			_sword_blade_area.sweep()
 	else:
+		if _sword_blade_area != null:
+			_sword_blade_area.deactivate()
 		var dir := _steer_clear(to_bull.normalized(), delta)
 		_accelerate(dir, DP.f("mat_attack_speed"), delta)
 		_play_anim(_ANIM_RUN)
@@ -558,6 +618,50 @@ func _tick_attack(delta: float) -> void:
 	move_and_slide()
 
 
+# How far through the attack swing: 0 (just committed) → 1 (finished), tracking the clip's progress.
+func _swing_phase() -> float:
+	var length := _anim_length(_ANIM_ATTACK, 0.9)
+	if length <= 0.0:
+		return 1.0
+	return clampf(1.0 - _swing_timer / length, 0.0, 1.0)
+
+
+# Break off after a stab instead of drilling the same thrust: give ground, hurl a spear, or circle.
+# The brain re-engages after; _decide_cd is reset so the pick plays out before it re-scores.
+func _do_stab_followup() -> void:
+	_decide_cd = DP.f("mat_decide_interval")
+	_dodge_cd = DP.f("mat_dodge_cooldown")
+	_steer_cd = 0.0
+	var roll := randf()
+	if roll < 0.2 and _throw_aim_cd <= 0.0 and is_instance_valid(_sword_node):
+		_start_throw()                 # ranged flourish
+	elif roll < 0.6:
+		_state = State.FLEE            # give ground after the thrust
+		_intent = Intent.FLEE
+	else:
+		_state = State.WANDER          # circle to a fresh angle before pressing again
+		_intent = Intent.WANDER
+		_pick_wander_target()
+
+
+# A stab that LANDED: milk it. Break into a long taunt held toward the bull, then drift out to the
+# showmanship ring — and lock ATTACK out for the whole hold (_attack_cd) so the brain can't drag the
+# matador straight back into another thrust. DODGE/FLEE stay live, so a charging bull is still
+# answered. This is what stops the "stab, stab, stab" spam after the matador connects.
+func _do_taunt_retreat() -> void:
+	_state = State.WANDER
+	_intent = Intent.WANDER
+	_idle_timer = randf_range(DP.f("mat_taunt_hold") * 0.7, DP.f("mat_taunt_hold") * 1.3)
+	_idle_anim = _pick_taunt()
+	_taunt_swap = randf_range(1.5, 3.0)
+	_attack_cd = maxf(_attack_cd, _idle_timer)
+	_dodge_cd = DP.f("mat_dodge_cooldown")
+	_steer_cd = 0.0
+	_pick_wander_target()
+	if _sword_blade_area != null:
+		_sword_blade_area.deactivate()
+
+
 func _enter_roll(hit_dir: Vector3) -> void:
 	_state = State.ROLL
 	# Match the state to the actual clip so the roll plays through once instead of
@@ -571,9 +675,8 @@ func _enter_roll(hit_dir: Vector3) -> void:
 		_anim_player.seek(0.0, true)
 
 
-# Called by the spawner (deferred) to make the matador leap-roll toward a target
+# Called (deferred) by the spawner to make the matador leap-roll toward a target on entry — the
-# point on entry — the cinematic arena entrance. After the roll it transitions to
+# cinematic arena entrance. After the roll it transitions to normal AI via the ROLL → FLEE path.
-# normal AI via the standard ROLL → FLEE path.
 func enter_spawn_roll(toward: Vector3) -> void:
 	var dir := toward - global_position
 	dir.y = 0.0
@@ -762,34 +865,84 @@ func _on_body_entered(body: Node3D) -> void:
 	if not body.is_in_group(&"player"):
 		return
 	var player := body as CharacterBody3D
-	if player.velocity.length() < DP.f("mat_hit_threshold"):
+	var bull_speed := player.velocity.length()
+	if bull_speed < DP.f("mat_hit_threshold"):
+		return
+	if not _horns_first(player.global_position):
 		return
 	var flat_vel := Vector3(player.velocity.x, 0.0, player.velocity.z)
 	var hit_dir  := flat_vel.normalized() if flat_vel.length() > 0.5 else \
 		(global_position - player.global_position).normalized()
+	_take_bull_charge(bull_speed, hit_dir)
 
-	if randf() < DP.f("mat_roll_chance"):
+
+# Tunnel-proof charge detection: at dash speed the bull skips clean over the thin HitArea between
+# ticks, so body_entered never fires. Sweep its actual travel (prev → now) and gore on any pass within
+# mat_charge_gore_radius. Runs every frame (even ragdolled) to keep the segment fresh.
+func _sweep_bull_gore() -> void:
+	var now := _bull.global_position
+	var seg_from := _bull_prev_pos if _bull_prev_seen else now
+	_bull_prev_pos = now
+	_bull_prev_seen = true
+	if _state == State.RAGDOLL or _state == State.ROLL:
+		return
+	var flat_vel := Vector3(_bull.velocity.x, 0.0, _bull.velocity.z)
+	var bull_speed := flat_vel.length()
+	if bull_speed < DP.f("mat_hit_threshold"):
+		return
+	var a := Vector3(seg_from.x, 0.0, seg_from.z)
+	var b := Vector3(now.x, 0.0, now.z)
+	var p := Vector3(global_position.x, 0.0, global_position.z)
+	var closest := Geometry3D.get_closest_point_to_segment(p, a, b)
+	if p.distance_to(closest) > DP.f("mat_charge_gore_radius"):
+		return
+	if not _horns_first(seg_from):
+		return
+	var hit_dir := flat_vel.normalized() if bull_speed > 0.5 \
+		else (global_position - now).normalized()
+	_take_bull_charge(bull_speed, hit_dir)
+
+
+# Horns-first gate: gore only when the bull's velocity points within bull_gore_arc of the direction
+# from `from` to the matador — not a sideways brush or backing in. The dash ability skips the gate.
+func _horns_first(from: Vector3) -> bool:
+	if _bull == null:
+		return false
+	if _bull.has_method(&"is_dashing") and _bull.call(&"is_dashing"):
+		return true   # the dash ability is a committed lunge — it gores on contact, no angle gate
+	var vel := Vector3(_bull.velocity.x, 0.0, _bull.velocity.z)
+	if vel.length() < 0.5:
+		return false
+	var to_me := global_position - from
+	to_me.y = 0.0
+	if to_me.length() < 0.01:
+		return true
+	return vel.normalized().dot(to_me.normalized()) > cos(deg_to_rad(DP.f("bull_gore_arc")))
+
+
+# Resolve a connected charge: the survival roll fades as bull speed climbs (mat_charge_pierce), so a
+# committed charge gores rather than getting shrugged off.
+func _take_bull_charge(bull_speed: float, hit_dir: Vector3) -> void:
+	# The boulder roll bowls matadors over with its own launch + chain (player._roll_try_pop); don't
+	# pre-empt that with a quiet gore, or the ball rolls straight through without popping.
+	if _bull.has_method(&"is_rolling") and _bull.call(&"is_rolling"):
+		return
+	# The dash is a committed lunge — a connect is a guaranteed kill, no survival roll (it already
+	# bypasses the horns cone). A passive cruise-charge still leaves a roll chance that fades with speed.
+	var roll_chance := 0.0
+	if not (_bull.has_method(&"is_dashing") and _bull.call(&"is_dashing")):
+		var floor_spd := DP.f("mat_hit_threshold")
+		var full_spd := maxf(DP.f("mat_charge_speed"), floor_spd + 0.1)
+		var commit := clampf((bull_speed - floor_spd) / (full_spd - floor_spd), 0.0, 1.0)
+		roll_chance = DP.f("mat_roll_chance") * (1.0 - commit * DP.f("mat_charge_pierce"))
+	if randf() < roll_chance:
 		_enter_roll(hit_dir)
 	else:
-		_enter_ragdoll(hit_dir, player.velocity.length())
+		_enter_ragdoll(hit_dir, bull_speed)
 
 
-func _on_blade_hit(body: Node3D) -> void:
+# Reach-based hit for the sidestep PASS (fast lateral sweep — the thin blade Area tunnels, so a
-	if _state != State.ATTACK and _state != State.SIDESTEP and _state != State.BRACE:
+# distance+facing check is the reliable gore; the ATTACK stab uses the blade collider instead).
-		return
-	if not body.is_in_group(&"player"):
-		return
-	if _blade_hit_cd > 0.0:
-		return
-	_blade_hit_cd = DP.f("mat_stab_cooldown")
-	body.call(&"take_sword_hit", "gored")
-
-
-# Reach-based stab. A charging bull crosses metres per physics frame, so it easily
-# tunnels through the thin blade Area between frames — this distance check is the
-# reliable hit. Called from the offensive ticks (active swing / pass) whenever the
-# blade is drawn: if the bull is inside reach AND the matador is facing it — the
-# blade actually presented, not held off to the side — it's gored.
 func _try_melee_hit(reach: float) -> void:
 	if _blade_hit_cd > 0.0 or not _sword_in_hand or _bull == null:
 		return
@@ -798,19 +951,17 @@ func _try_melee_hit(reach: float) -> void:
 	var dist := to_bull.length()
 	if dist > reach or dist < 0.01:
 		return
-	# Only lands within the frontal arc — you're gored on a presented blade, not by
-	# brushing a matador whose sword is pointing elsewhere.
 	var facing := Vector3(sin(_mesh.rotation.y), 0.0, cos(_mesh.rotation.y))
 	if facing.dot(to_bull / dist) < cos(deg_to_rad(DP.f("mat_stab_arc"))):
 		return
 	_blade_hit_cd = DP.f("mat_stab_cooldown")
-	_bull.call(&"take_sword_hit", "gored")
+	DamageEvent.deal(_bull, DamageEvent.Cause.GORED, _bull.global_position, self)
 
 
 func _enter_ragdoll(hit_dir: Vector3, bull_speed: float, up_boost: float = 0.0) -> void:
 	_state = State.RAGDOLL
-	if _sword_blade_area:
+	if _sword_blade_area != null:
-		_sword_blade_area.monitoring = false
+		_sword_blade_area.deactivate()
 	_clear_spear()  # a spear mid-wind-up dies with the matador, not in the air
 	killed.emit()
 	var cleanup_timer := get_tree().create_timer(4.0)
@@ -1003,10 +1154,9 @@ func _pick_wander_target() -> void:
 
 # ── Sword attachment ──────────────────────────────────────────────────────────
 
-# The rig (matador_v03) carries two purpose-built bones: weapon_bone (right-hand
+# The rig (matador_v03) carries two bones: weapon_bone (right-hand grip) and weapon_rest_bone (hip
-# grip) and weapon_rest_bone (hip holster). The sword rides in the holster and is
+# holster). The sword rides in the holster, carried to the hand in combat (_carry_sword); each bone
-# carried to the hand in combat (see _carry_sword); each bone has its own DP-tunable
+# has its own DP-tunable offset/rotation (sword_* / sword_rest_*) so the poses seat independently.
-# local offset/rotation (sword_* / sword_rest_*) so the poses seat independently.
 func _setup_sword() -> void:
 	if not _skeleton:
 		return
@@ -1039,28 +1189,15 @@ func _spawn_sword() -> void:
 	_drawing = false
 	_apply_sword_grip()
 
-	# Blade collider along +Z (hilt at origin), tipped from the capsule's default Y.
+	# The blade hitbox (sword.tscn, hitbox.gd) is armed only during the ATTACK thrust (see
-	# Only monitors while the sword is in hand (see _carry_sword).
+	# _tick_attack); off while merely carried, so brushing a drawn matador never gores the bull.
-	var blade_cap := CapsuleShape3D.new()
+	_sword_blade_area = _sword_node.get_node_or_null("BladeHitbox") as Hitbox
-	blade_cap.radius = 0.18
+	if _sword_blade_area != null:
-	blade_cap.height = 1.30
+		_sword_blade_area.deactivate()
-	var blade_cs := CollisionShape3D.new()
-	blade_cs.shape = blade_cap
-	blade_cs.position = Vector3(0.0, 0.0, 0.8)
-	blade_cs.rotation_degrees = Vector3(90.0, 0.0, 0.0)
-
-	_sword_blade_area = Area3D.new()
-	_sword_blade_area.collision_layer = 0
-	_sword_blade_area.collision_mask  = 1
-	_sword_blade_area.monitoring = _sword_in_hand
-	_sword_blade_area.add_child(blade_cs)
-	_sword_node.add_child(_sword_blade_area)
-	_sword_blade_area.body_entered.connect(_on_blade_hit)
 
 
-# The sword is MELEE-only: drawn while fighting up close (ATTACK) or guarding
+# The sword is MELEE-only: drawn for ATTACK / BRACE / SIDESTEP, holstered otherwise. Ranged throws
-# (BRACE / SIDESTEP), holstered otherwise. Ranged throws use a spear instead
+# use a spear (_spawn_spear_in_hand), so THROW keeps the sword holstered.
-# (see _spawn_spear_in_hand), so THROW keeps the sword holstered.
 func _wants_sword_drawn() -> bool:
 	return _state == State.ATTACK \
 		or _state == State.BRACE or _state == State.SIDESTEP
@@ -1069,6 +1206,9 @@ func _wants_sword_drawn() -> bool:
 func _update_sword_carry() -> void:
 	if not is_instance_valid(_sword_node) or _state == State.RAGDOLL:
 		return
+	# The blade collider lives only during the ATTACK thrust; leaving ATTACK disarms it.
+	if _state != State.ATTACK and _sword_blade_area != null:
+		_sword_blade_area.deactivate()
 	if _wants_sword_drawn():
 		if not _sword_in_hand and not _drawing:
 			_begin_draw()
@@ -1148,8 +1288,9 @@ func _carry_sword(in_hand: bool) -> void:
 	_sword_in_hand = in_hand
 	_sword_node.reparent(target, false)
 	_apply_sword_grip()
-	if _sword_blade_area:
+	# Carrying never arms the blade — only the ATTACK thrust does (see _tick_attack).
-		_sword_blade_area.monitoring = in_hand
+	if _sword_blade_area != null:
+		_sword_blade_area.deactivate()
 
 
 func _apply_sword_grip() -> void:

actors/matador/matador.tscn

@@ -1,7 +1,7 @@
-[gd_scene format=3 uid="uid://matador_scene_v1"]
+[gd_scene format=3 uid="uid://d0te4mwbh33ag"]
 
-[ext_resource type="Script" path="res://matador.gd" id="1_matgd"]
+[ext_resource type="Script" uid="uid://bvfa7xi0luysk" path="res://actors/matador/matador.gd" id="1_matgd"]
-[ext_resource type="PackedScene" uid="uid://eu2lqjhowj4t" path="res://Assets/Matador.glb" id="2_matfbx"]
+[ext_resource type="PackedScene" uid="uid://eu2lqjhowj4t" path="res://art/characters/matador.glb" id="2_matfbx"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_body"]
 radius = 0.25
@@ -11,19 +11,18 @@ height = 1.2
 radius = 0.45
 height = 1.4
 
-[node name="Matador" type="CharacterBody3D"]
+[node name="Matador" type="CharacterBody3D" unique_id=1781857630]
 script = ExtResource("1_matgd")
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=2101651042]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
 shape = SubResource("CapsuleShape3D_body")
 
-[node name="HitArea" type="Area3D" parent="."]
+[node name="HitArea" type="Area3D" parent="." unique_id=745037545]
-monitoring = true
 monitorable = false
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="HitArea"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="HitArea" unique_id=1497356275]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
 shape = SubResource("CapsuleShape3D_hit")
 
-[node name="matador2" parent="." instance=ExtResource("2_matfbx")]
+[node name="matador2" parent="." unique_id=1487256381 instance=ExtResource("2_matfbx")]

actors/matador/matador_ragdoll.gd

@@ -4,6 +4,8 @@ extends RefCounted
 ## limited swing/twist (DP-tunable) so the corpse keeps its silhouette instead of
 ## folding into a flat "deflated" pile; the cape stays free (PIN) so it drapes.
 
+const PhysicsLayers = preload("res://systems/combat/physics_layers.gd")
+
 # [bone, radius] → sphere collider; [bone, radius, height] → capsule.
 const _BONES: Array = [
 	["matador",       0.18],
@@ -53,10 +55,15 @@ static func build(skeleton: Skeleton3D) -> PhysicalBoneSimulator3D:
 		pb.bone_name       = bname
 		pb.mass            = 0.4
 		pb.linear_damp     = 0.1
-		pb.collision_layer = 1
+		# The ragdoll only simulates once the matador is dead, so it lives on the CORPSE
-		pb.collision_mask  = 1
+		# layer and masks to CORPSE alone: it rests on the ground/walls (which also carry
+		# CORPSE) but the bull — which collides only with WORLD — passes straight through
+		# the bodies instead of tripping over them.
+		pb.collision_layer = PhysicsLayers.CORPSE
+		pb.collision_mask  = PhysicsLayers.CORPSE
 		if bname.begins_with("Bone"):
-			# Cape: floppy cloth — free swing, light, draggy, one-way collision.
+			# Cape: floppy cloth — free swing, light, draggy, one-way collision (layer 0
+			# so nothing collides with it; it still drapes on the CORPSE-masked ground).
 			pb.joint_type      = PhysicalBone3D.JOINT_TYPE_PIN
 			pb.mass            = 0.15
 			pb.linear_damp     = 0.5

actors/matador/spear.tscn

@@ -0,0 +1,15 @@
+[gd_scene format=3 uid="uid://c8spearwrap01"]
+
+[ext_resource type="PackedScene" uid="uid://jepc74w8opbu" path="res://art/weapons/spear.glb" id="1_spearglb"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_shaft"]
+radius = 0.13
+height = 2.2
+
+[node name="Spear" type="Node3D"]
+
+[node name="spear" parent="." instance=ExtResource("1_spearglb")]
+
+[node name="HitShape" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0.79)
+shape = SubResource("CapsuleShape3D_shaft")

actors/matador/spear_projectile.gd

@@ -10,6 +10,8 @@ extends RigidBody3D
 # (see shed_all, which the bull's slam calls to fling them all off); other hits pin
 # it in place until the despawn timer clears it.
 
+const PhysicsLayers = preload("res://systems/combat/physics_layers.gd")
+
 const _DESPAWN_SEC: float = 8.0
 const _STUCK_GROUP: StringName = &"stuck_spear"
 # Shaft geometry in spear.glb local space: tip at +Z, butt behind the origin.
@@ -34,16 +36,25 @@ static func launch(parent: Node, mesh: Node3D, origin: Vector3, velocity: Vector
 	var s := SpearProjectile.new()
 	s.gravity_scale = gravity
 	s.collision_layer = 0
-	s.collision_mask = 1
+	# Mask WORLD so a miss sticks in the arena, and BULL so it can actually hit the
+	# bull — the bull's body is on layer BULL, not WORLD, so a WORLD-only mask flew
+	# straight through it (every throw whiffed, even against a stationary bull).
+	s.collision_mask = PhysicsLayers.WORLD | PhysicsLayers.BULL
 	s.contact_monitor = true
 	s.max_contacts_reported = 6
 	parent.add_child(s)
 	# Seat the body so its local +Z (the shaft, see spear.glb) points along the throw.
 	s.global_transform = Transform3D(_aim_basis(velocity), origin)
+	# Take the editor-tweakable collider from the spear wrapper (Spear.tscn's HitShape)
+	# before reparenting, then drop the now-nested template.
+	var collider := _collider_from(mesh)
 	mesh.reparent(s, false)
 	mesh.transform = Transform3D.IDENTITY
 	s._mesh = mesh
-	s.add_child(_shaft_collider())
+	var tmpl := mesh.get_node_or_null("HitShape")
+	if tmpl != null:
+		tmpl.queue_free()
+	s.add_child(collider)
 	s.linear_velocity = velocity
 	_despawn(s)
 	return s
@@ -84,6 +95,18 @@ static func shed_all(bull: Node) -> void:
 		_despawn(rb)
 
 
+# Clone the wrapper's editor-tweakable HitShape (Spear.tscn) into a fresh CollisionShape3D
+# for the projectile body; falls back to the built-in shaft collider if it's missing.
+static func _collider_from(source: Node) -> CollisionShape3D:
+	var tmpl := source.get_node_or_null("HitShape") as CollisionShape3D
+	if tmpl != null and tmpl.shape != null:
+		var cs := CollisionShape3D.new()
+		cs.shape = tmpl.shape
+		cs.transform = tmpl.transform
+		return cs
+	return _shaft_collider()
+
+
 static func _shaft_collider() -> CollisionShape3D:
 	# Collider along local +Z (mesh runs z≈-0.34 … 1.92), fattened so a fast throw
 	# can't tunnel past the bull's collision spheres.
@@ -200,7 +223,7 @@ func _embed(other: Object, contact: Vector3, flight: Vector3) -> void:
 	var pose := Transform3D(_aim_basis(f), contact + f * (_EMBED_DEPTH - _TIP_Z))
 	var bull := other as Node
 	if bull != null and bull.is_in_group(&"player"):
-		bull.call(&"take_sword_hit", "thrown", contact)
+		DamageEvent.deal(bull, DamageEvent.Cause.THROWN, contact, self)
 		if is_instance_valid(_mesh) and is_instance_valid(bull):
 			_mesh.reparent(_spear_anchor(bull), false)
 			_mesh.global_transform = pose

actors/matador/sword.tscn

@@ -0,0 +1,20 @@
+[gd_scene format=3 uid="uid://c8swordwrap01"]
+
+[ext_resource type="PackedScene" uid="uid://xyvank512l5n" path="res://art/weapons/sword.glb" id="1_swordglb"]
+[ext_resource type="Script" path="res://systems/combat/hitbox.gd" id="2_hitbox"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_blade"]
+radius = 0.18
+height = 1.3
+
+[node name="Sword" type="Node3D"]
+
+[node name="sword" parent="." instance=ExtResource("1_swordglb")]
+
+[node name="BladeHitbox" type="Area3D" parent="."]
+script = ExtResource("2_hitbox")
+damage_cause = "gored"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="BladeHitbox"]
+transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0.8)
+shape = SubResource("CapsuleShape3D_blade")

actors/player/bull_impact_fx.gd

@@ -0,0 +1,110 @@
+extends Node
+## Procedural (non-particle) bull impact FX: the expanding ground-slam shockwave rings and the
+## kick flash-pop. These are tween-animated MeshInstance3D flashes, not CPUParticles3D, so they
+## can't be authored as systems/fx/ scenes and live in code here. Created by player.gd; the
+## transient meshes are parented into the level (the bull's parent) so they hold their world
+## position while the bull keeps moving.
+
+var _player: Node3D
+var _ring_mesh: ArrayMesh = null
+
+
+func setup(player: Node3D) -> void:
+	_player = player
+
+
+# Three nested shockwave rings racing outward from a ground slam, each fading as it grows.
+func slam_rings(origin: Vector3, max_r: float) -> void:
+	if _ring_mesh == null:
+		_ring_mesh = _make_ring_mesh()
+	_launch_ring(origin, max_r, 0.00, 0.55, Color(1.0, 0.70, 0.10, 0.85))
+	_launch_ring(origin, max_r, 0.10, 0.52, Color(1.0, 0.50, 0.10, 0.65))
+	_launch_ring(origin, max_r, 0.20, 0.48, Color(0.9, 0.30, 0.10, 0.50))
+
+
+# A quick bright flash-pop at the kick's contact point.
+func kick_flash(origin: Vector3) -> void:
+	var mat := _flat_material(Color(1.0, 0.97, 0.40, 0.0))
+	var sphere := SphereMesh.new()
+	sphere.radius = 1.0
+	sphere.height = 2.0
+	sphere.radial_segments = 8
+	sphere.rings = 4
+	sphere.material = mat
+
+	var mi := MeshInstance3D.new()
+	mi.mesh = sphere
+	mi.material_override = mat
+	mi.scale = Vector3(0.05, 0.05, 0.05)
+	_host().add_child(mi)
+	mi.global_position = origin
+
+	var tween := create_tween()
+	tween.set_parallel(true)
+	tween.tween_property(mi, "scale", Vector3(0.7, 0.7, 0.7), 0.13)\
+		.set_trans(Tween.TRANS_EXPO).set_ease(Tween.EASE_OUT)
+	var fade := func(a: float) -> void: mat.albedo_color.a = a
+	tween.tween_method(fade, 0.92, 0.0, 0.14)\
+		.set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_IN)
+	tween.tween_callback(mi.queue_free).set_delay(0.16)
+
+
+func _launch_ring(origin: Vector3, max_r: float, delay: float, duration: float, col: Color) -> void:
+	var mat := _flat_material(Color(col.r, col.g, col.b, 0.0))
+	var mi := MeshInstance3D.new()
+	mi.mesh = _ring_mesh
+	mi.material_override = mat
+	mi.scale = Vector3(0.02, 1.0, 0.02)
+	_host().add_child(mi)
+	mi.global_position = origin
+
+	var tween := create_tween()
+	tween.set_parallel(true)
+	tween.tween_property(mi, "scale", Vector3(max_r, 1.0, max_r), duration)\
+		.set_delay(delay).set_trans(Tween.TRANS_EXPO).set_ease(Tween.EASE_OUT)
+	var fade := func(a: float) -> void: mat.albedo_color.a = a
+	tween.tween_method(fade, col.a, 0.0, duration)\
+		.set_delay(delay).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_IN)
+	tween.tween_callback(mi.queue_free).set_delay(delay + duration + 0.05)
+
+
+func _flat_material(color: Color) -> StandardMaterial3D:
+	var mat := StandardMaterial3D.new()
+	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+	mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
+	mat.cull_mode = BaseMaterial3D.CULL_DISABLED
+	mat.albedo_color = color
+	return mat
+
+
+# A flat annulus in the XZ plane (unit radius), scaled up at runtime into the shockwave ring.
+func _make_ring_mesh() -> ArrayMesh:
+	const INNER_R: float = 0.82
+	const OUTER_R: float = 1.00
+	const SEGMENTS: int = 48
+
+	var verts := PackedVector3Array()
+	var indices := PackedInt32Array()
+	for i: int in SEGMENTS:
+		var a0 := i / float(SEGMENTS) * TAU
+		var a1 := (i + 1) / float(SEGMENTS) * TAU
+		var vi := i * 4
+		verts.append(Vector3(cos(a0) * INNER_R, 0.0, sin(a0) * INNER_R))
+		verts.append(Vector3(cos(a0) * OUTER_R, 0.0, sin(a0) * OUTER_R))
+		verts.append(Vector3(cos(a1) * OUTER_R, 0.0, sin(a1) * OUTER_R))
+		verts.append(Vector3(cos(a1) * INNER_R, 0.0, sin(a1) * INNER_R))
+		indices.append_array([vi, vi + 2, vi + 1, vi, vi + 3, vi + 2])
+
+	var arrays: Array = []
+	arrays.resize(Mesh.ARRAY_MAX)
+	arrays[Mesh.ARRAY_VERTEX] = verts
+	arrays[Mesh.ARRAY_INDEX] = indices
+	var mesh := ArrayMesh.new()
+	mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)
+	return mesh
+
+
+func _host() -> Node:
+	if _player != null and _player.get_parent() != null:
+		return _player.get_parent()
+	return _player

actors/player/bull_impact_fx.gd.uid

@@ -0,0 +1 @@
+uid://sf5etma4kjt0

actors/player/camera_iso.gd

@@ -1,3 +1,4 @@
+class_name IsoCamera
 extends Camera3D
 
 @export var height: float = 25.0
@@ -16,6 +17,11 @@ var _shake_amount: float = 0.0
 var _shake_decay: float = 0.0
 var _user_fov: float = 0.0
 
+# Per-level framing multiplier: 1.0 = the designer's base shot, >1 dollies the camera
+# back for a wider view (the lobby uses this). Set by game_shell when a level loads;
+# kept separate from the scroll-wheel FOV zoom so the two don't fight.
+var _framing_scale: float = 1.0
+
 # Trailing-camera state: _focus is the smoothed point the camera frames (it lags
 # the bull), _drag_offset is the velocity-driven trail that slides it behind.
 var _focus: Vector3 = Vector3.ZERO
@@ -51,15 +57,21 @@ func adjust_zoom(ratio: float) -> void:
 	_user_fov = clampf(_user_fov / ratio, fov_min, fov_max)
 
 
+## Dolly the camera in/out for the level being loaded. 1.0 is the base framing; >1 pulls
+## back for a wider shot (the lobby hub uses this). Independent of the scroll-wheel zoom.
+func set_framing_scale(scale: float) -> void:
+	_framing_scale = maxf(scale, 0.1)
+
+
 func _process(delta: float) -> void:
 	fov = lerpf(fov, _user_fov, delta * 8.0)
 
 	var angle_rad := deg_to_rad(horizontal_angle_deg)
 
 	var offset := Vector3(
-		sin(angle_rad) * horizontal_distance,
+		sin(angle_rad) * horizontal_distance * _framing_scale,
-		height,
+		height * _framing_scale,
-		cos(angle_rad) * horizontal_distance
+		cos(angle_rad) * horizontal_distance * _framing_scale
 	)
 
 	var target := get_parent() as Node3D

actors/player/player.gd

@@ -8,7 +8,7 @@ const HOOF_OFFSETS: Array = [
 	Vector3( 0.30, -0.25,  0.60),
 ]
 
-# Bull animation clips (Armature|* action names in Assets/bull.fbx). IDLE is the
+# Bull animation clips (Armature|* action names in art/characters/bull.fbx). IDLE is the
 # looping base pose; the others are one-shot ability clips that return to it.
 const _ANIM_IDLE: StringName = &"Armature|IDLE"
 const _ANIM_KICK: StringName = &"Armature|KICK"
@@ -27,7 +27,11 @@ var _legs: Node
 var _was_on_floor: bool         = false
 var _pre_slide_vel_y: float     = 0.0
 
-var _slam_ring_mesh: ArrayMesh = null
+# Built once and reused: a fresh StandardMaterial3D/SphereMesh per spawn makes a mobile WebGL
+# driver recompile the shader + re-upload the mesh — a hitch "when attacking" absent on desktop.
+var _unshaded_mat: StandardMaterial3D = null
+var _particle_sphere_cache: Dictionary = {}   # "radius:seg:ring" -> SphereMesh (shared)
+var _impact_fx: Node = null   # bull_impact_fx.gd — the coded (non-particle) slam rings + kick flash
 
 # Ability system — kick=0, dash=1, slam=2, roll=3
 var ability_cd:      Array[float] = [0.0, 0.0, 0.0, 0.0]
@@ -67,6 +71,9 @@ signal health_changed(current: int, max_hp: int)
 signal hit_taken(cause: String)
 var _max_hp:      int   = 10
 var _hp:          int   = 10
+# Bonus pips granted by lobby rewards (e.g. smashing every barrel). Tacked on top of the
+# base bar; the HUD paints these top pips yellow instead of red.
+var _bonus_hp:    int   = 0
 var _hit_iframes: float = 0.0
 
 var _huff_player:     AudioStreamPlayer   = null
@@ -75,15 +82,34 @@ var _huff_timer:      float               = 0.0
 
 enum DustState { NONE, WALK, CHARGE }
 var _dust_state: DustState = DustState.NONE
-var _walk_dust_ramp:   Gradient = null
+# Hoof-dust scale/velocity per state (the look — mesh, colour, curve — lives in bull_hoof_dust.tscn).
-var _charge_dust_ramp: Gradient = null
+# A charge sprint kicks up bigger, faster dust than a walk.
+const _WALK_DUST_SCALE:   Vector2 = Vector2(0.20, 0.40)
+const _WALK_DUST_VEL:     Vector2 = Vector2(0.8, 1.8)
+const _CHARGE_DUST_SCALE: Vector2 = Vector2(0.35, 0.70)
+const _CHARGE_DUST_VEL:   Vector2 = Vector2(2.8, 5.5)
+
+
+const RigidSkin = preload("res://systems/render/rigid_skin.gd")
+
+var _hit_flash_tween: Tween
 
 
 func _ready() -> void:
 	add_to_group(&"player")
+	# Native GPU skinning by default (the old Mali/ANGLE invisible-skinning bug is fixed in the
+	# 4.7 web templates). rigid_skin is now an opt-in fallback — see Controls.rigid_skin_enabled().
+	if Controls.rigid_skin_enabled():
+		RigidSkin.convert_tree(self)
 	_max_hp = maxi(1, int(DP.f("bull_max_hp")))
 	_hp = _max_hp
+	# Carry any run-long bonus pips (barrel reward) into this level so they survive the
+	# scene reload between fights; the HUD paints these top pips yellow.
+	_bonus_hp = Run.bonus_hp
+	_max_hp += _bonus_hp
+	_hp += _bonus_hp
 	_cube_scale = cube_guy.scale
+	_setup_impact_fx()
 	_setup_hoof_dust()
 	_setup_legs()
 	_setup_charge_trail()
@@ -91,123 +117,44 @@ func _ready() -> void:
 	_setup_audio()
 	_bull_anim = _find_anim_player(cube_guy)
 	_setup_bull_idle()
-	DP.any_changed.connect(_on_dp_changed)
 
 
 func _setup_legs() -> void:
 	_legs = Node.new()
-	_legs.set_script(load("res://bull_legs.gd"))
+	_legs.set_script(load("res://actors/player/bull_legs.gd"))
 	add_child(_legs)
 	_legs.call(&"setup", self, cube_guy)
 
 
+func _setup_impact_fx() -> void:
+	_impact_fx = Node.new()
+	_impact_fx.set_script(load("res://actors/player/bull_impact_fx.gd"))
+	add_child(_impact_fx)
+	_impact_fx.call(&"setup", self)
+
+
+# The bull's ability/movement particle effects are authored as scenes in systems/fx/ (so Siim can
+# tune them in the inspector). The continuous ones follow the bull — instanced once here as
+# children, then toggled via `emitting`. The one-shots are fired on demand through Fx.spawn().
 func _setup_hoof_dust() -> void:
-	var sphere := _particle_sphere(0.07, 4, 2, _unshaded_material())
-
-	_walk_dust_ramp = Gradient.new()
-	_walk_dust_ramp.set_color(0, Color(0.94, 0.90, 0.83, 1.0))
-	_walk_dust_ramp.set_color(1, Color(0.94, 0.90, 0.83, 0.0))
-
-	# White-beige dust while running
-	_charge_dust_ramp = Gradient.new()
-	_charge_dust_ramp.set_color(0, Color(0.94, 0.90, 0.83, 1.0))
-	_charge_dust_ramp.set_color(1, Color(0.94, 0.90, 0.83, 0.0))
-
-	var scale_curve := Curve.new()
-	scale_curve.add_point(Vector2(0.0, 0.2))
-	scale_curve.add_point(Vector2(0.4, 1.0))
-	scale_curve.add_point(Vector2(1.0, 0.0))
-
 	for offset: Vector3 in HOOF_OFFSETS:
-		var p := CPUParticles3D.new()
+		var p := Fx.attach(&"bull_hoof_dust", cube_guy) as CPUParticles3D
+		if p == null:
+			continue
 		p.position = offset
-		p.emitting = false
-		p.amount = 12
-		p.lifetime = DP.f("dust_lifetime")
-		p.explosiveness = DP.f("dust_explosiveness")
-		p.randomness = 0.6
-		p.local_coords = false
-		p.direction = Vector3(0.0, 1.0, 0.0)
-		p.spread = DP.f("dust_spread")
-		p.gravity = Vector3(0.0, DP.f("dust_gravity_y"), 0.0)
-		p.initial_velocity_min = DP.f("walk_vel_min")
-		p.initial_velocity_max = DP.f("walk_vel_max")
-		p.scale_amount_min = DP.f("walk_scale_min")
-		p.scale_amount_max = DP.f("walk_scale_max")
-		p.mesh = sphere
-		p.color_ramp = _walk_dust_ramp
-		p.scale_amount_curve = scale_curve
-		cube_guy.add_child(p)
 		_hoof_emitters.append(p)
 
 
 func _setup_charge_trail() -> void:
-	# Blue energy trail — streams backward during a fast run / roll
+	_charge_trail_emitter = Fx.attach(&"bull_charge_trail", cube_guy) as CPUParticles3D
-	var trail_sphere := _particle_sphere(0.065, 4, 2, _unshaded_material())
+	if _charge_trail_emitter != null:
-
+		_charge_trail_emitter.position = Vector3(0.0, 0.25, 0.3)
-	var trail_ramp := Gradient.new()
-	trail_ramp.set_color(0, Color(0.30, 0.65, 1.0, 1.0))
-	trail_ramp.set_color(1, Color(0.30, 0.65, 1.0, 0.0))
-
-	var trail_scale := Curve.new()
-	trail_scale.add_point(Vector2(0.0, 1.0))
-	trail_scale.add_point(Vector2(0.6, 0.8))
-	trail_scale.add_point(Vector2(1.0, 0.0))
-
-	_charge_trail_emitter = CPUParticles3D.new()
-	_charge_trail_emitter.position = Vector3(0.0, 0.25, 0.3)
-	_charge_trail_emitter.emitting = false
-	_charge_trail_emitter.one_shot = false
-	_charge_trail_emitter.amount = 18
-	_charge_trail_emitter.lifetime = 0.30
-	_charge_trail_emitter.randomness = 0.4
-	_charge_trail_emitter.local_coords = false
-	_charge_trail_emitter.direction = Vector3(0.0, 0.2, 1.0).normalized()
-	_charge_trail_emitter.spread = 25.0
-	_charge_trail_emitter.gravity = Vector3(0.0, 2.0, 0.0)
-	_charge_trail_emitter.initial_velocity_min = 4.0
-	_charge_trail_emitter.initial_velocity_max = 9.0
-	_charge_trail_emitter.scale_amount_min = 0.4
-	_charge_trail_emitter.scale_amount_max = 1.2
-	_charge_trail_emitter.mesh = trail_sphere
-	_charge_trail_emitter.color_ramp = trail_ramp
-	_charge_trail_emitter.scale_amount_curve = trail_scale
-	cube_guy.add_child(_charge_trail_emitter)
 
 
 func _setup_roll_sparks() -> void:
-	# Rammus Powerball ground spray — dirt/sparks flung outward from the spinning
+	_roll_spark_emitter = Fx.attach(&"bull_roll_sparks", cube_guy) as CPUParticles3D
-	# ball. World-space (local_coords off) so they peel off into a trail behind it.
+	if _roll_spark_emitter != null:
-	var spark := _particle_sphere(0.05, 4, 2, _unshaded_material())
+		_roll_spark_emitter.position = Vector3(0.0, 0.10, 0.0)
-
-	var ramp := Gradient.new()
-	ramp.set_color(0, Color(1.00, 0.78, 0.32, 1.0))
-	ramp.set_color(1, Color(0.70, 0.42, 0.14, 0.0))
-
-	var sc := Curve.new()
-	sc.add_point(Vector2(0.0, 0.30))
-	sc.add_point(Vector2(0.3, 1.00))
-	sc.add_point(Vector2(1.0, 0.00))
-
-	_roll_spark_emitter = CPUParticles3D.new()
-	_roll_spark_emitter.position = Vector3(0.0, 0.10, 0.0)
-	_roll_spark_emitter.emitting = false
-	_roll_spark_emitter.one_shot = false
-	_roll_spark_emitter.amount = 46
-	_roll_spark_emitter.lifetime = 0.45
-	_roll_spark_emitter.randomness = 0.7
-	_roll_spark_emitter.local_coords = false
-	_roll_spark_emitter.direction = Vector3(0.0, 1.0, 0.0)
-	_roll_spark_emitter.spread = 180.0
-	_roll_spark_emitter.gravity = Vector3(0.0, -6.0, 0.0)
-	_roll_spark_emitter.initial_velocity_min = 3.0
-	_roll_spark_emitter.initial_velocity_max = 8.0
-	_roll_spark_emitter.scale_amount_min = 0.5
-	_roll_spark_emitter.scale_amount_max = 1.3
-	_roll_spark_emitter.mesh = spark
-	_roll_spark_emitter.color_ramp = ramp
-	_roll_spark_emitter.scale_amount_curve = sc
-	cube_guy.add_child(_roll_spark_emitter)
 
 
 func _setup_audio() -> void:
@@ -229,42 +176,20 @@ func _setup_audio() -> void:
 		add_child(_crowd_player)
 
 
+# Toggle the hoof emitters and swap their scale/velocity for the walk vs charge feel. The blue
+# charge trail is the roll/dash ability's, driven from the roll loop, not by dust state.
 func _set_dust_state(new_state: DustState) -> void:
 	if new_state == _dust_state:
 		return
 	_dust_state = new_state
+	var scale := _CHARGE_DUST_SCALE if new_state == DustState.CHARGE else _WALK_DUST_SCALE
+	var vel := _CHARGE_DUST_VEL if new_state == DustState.CHARGE else _WALK_DUST_VEL
 	for p: CPUParticles3D in _hoof_emitters:
-		p.lifetime = DP.f("dust_lifetime")
+		p.scale_amount_min = scale.x
-		p.explosiveness = DP.f("dust_explosiveness")
+		p.scale_amount_max = scale.y
-		p.spread = DP.f("dust_spread")
+		p.initial_velocity_min = vel.x
-		p.gravity = Vector3(0.0, DP.f("dust_gravity_y"), 0.0)
+		p.initial_velocity_max = vel.y
-		match new_state:
+		p.emitting = new_state != DustState.NONE
-			DustState.NONE:
-				p.emitting = false
-			DustState.WALK:
-				p.color_ramp = _walk_dust_ramp
-				p.scale_amount_min = DP.f("walk_scale_min")
-				p.scale_amount_max = DP.f("walk_scale_max")
-				p.initial_velocity_min = DP.f("walk_vel_min")
-				p.initial_velocity_max = DP.f("walk_vel_max")
-				p.emitting = true
-			DustState.CHARGE:
-				p.color_ramp = _charge_dust_ramp
-				p.scale_amount_min = DP.f("charge_scale_min")
-				p.scale_amount_max = DP.f("charge_scale_max")
-				p.initial_velocity_min = DP.f("charge_vel_min")
-				p.initial_velocity_max = DP.f("charge_vel_max")
-				p.emitting = true
-	# Blue energy trail belongs to the roll/dash ability only, not to fast WASD
-	# running — driven explicitly in the roll loop / _end_roll, not by dust state.
-
-
-func _on_dp_changed(_key: String, _val: Variant) -> void:
-	if _hoof_emitters.is_empty() or _dust_state == DustState.NONE:
-		return
-	var prev := _dust_state
-	_dust_state = DustState.NONE
-	_set_dust_state(prev)
 
 
 func _find_anim_player(node: Node) -> AnimationPlayer:
@@ -298,7 +223,7 @@ func _play_idle() -> void:
 		return
 	_bull_anim.speed_scale = 1.0
 	if _bull_anim.has_animation(_ANIM_IDLE):
-		_bull_anim.play(_ANIM_IDLE, 0.2)
+		_bull_anim.play(_ANIM_IDLE, 0.05)
 
 
 # Drive the WASD locomotion clip: the looping DASH doubles as the run cycle while a
@@ -501,6 +426,7 @@ func _tick_roll(delta: float, _steer: Vector3) -> void:
 
 	move_and_slide()
 	_was_on_floor = is_on_floor()
+	_smash_barrels_in_radius(DP.f("roll_hit_radius"))
 	_roll_try_pop(speed)
 
 
@@ -539,22 +465,37 @@ func _roll_try_pop(speed: float) -> bool:
 	return false
 
 
-# Closest active matador we haven't already popped this roll, or null if none left.
+# Closest thing the roll should home on — an active matador (arena) or an intact barrel
+# (lobby) we haven't already smashed this roll. Null if nothing is left to hit.
 func _roll_pick_target() -> Node3D:
 	var best: Node3D = null
 	var best_d := INF
-	for mat: Node in get_tree().get_nodes_in_group(&"matador"):
+	for cand: Node3D in _roll_targets():
-		if _roll_hit.has(mat) or not _mat_active(mat):
+		var d: float = cand.global_position.distance_squared_to(global_position)
-			continue
-		var d: float = (mat as Node3D).global_position.distance_squared_to(global_position)
 		if d < best_d:
 			best_d = d
-			best = mat as Node3D
+			best = cand
 	return best
 
 
+# Live roll targets: active matadors plus standing barrels, minus anything already popped.
+func _roll_targets() -> Array[Node3D]:
+	var out: Array[Node3D] = []
+	for mat: Node in get_tree().get_nodes_in_group(&"matador"):
+		if not _roll_hit.has(mat) and _mat_active(mat):
+			out.append(mat as Node3D)
+	for barrel: Node in get_tree().get_nodes_in_group(&"barrel"):
+		if _barrel_alive(barrel):
+			out.append(barrel as Node3D)
+	return out
+
+
 func _roll_target_valid() -> bool:
-	return is_instance_valid(_roll_target) and _mat_active(_roll_target)
+	if not is_instance_valid(_roll_target):
+		return false
+	if _roll_target.is_in_group(&"barrel"):
+		return _barrel_alive(_roll_target)
+	return _mat_active(_roll_target)
 
 
 # A matador still in play — valid, not ragdolled/consumed. Ragdolled bodies report
@@ -563,8 +504,39 @@ func _mat_active(mat: Node) -> bool:
 	return is_instance_valid(mat) and mat.has_method(&"is_active") and mat.call(&"is_active")
 
 
-# End the Powerball early: brake hard (the ball "pops" and unrolls) and drop back to
+# A lobby barrel still standing — valid and not already queued for removal by an earlier hit.
-# the normal locomotion path next frame.
+func _barrel_alive(barrel: Node) -> bool:
+	return is_instance_valid(barrel) and not barrel.is_queued_for_deletion()
+
+
+# Burst every barrel whose centre sits within range_m on the ground plane. Shared by the
+# boulder roll (which ploughs straight through them) and the slam shockwave. Each barrel
+# self-removes and leaves the &"barrel" group, so the HUD's clear-the-lobby tally counts it
+# exactly once.
+func _smash_barrels_in_radius(range_m: float) -> void:
+	for barrel: Node in get_tree().get_nodes_in_group(&"barrel"):
+		if not _barrel_alive(barrel):
+			continue
+		var to_b: Vector3 = (barrel as Node3D).global_position - global_position
+		to_b.y = 0.0
+		if to_b.length() <= range_m:
+			barrel.call(&"destroy_barrel")
+
+
+# True while the boulder roll is live — matadors defer their charge-gore to the roll's own pop
+# (is_rolling guard in matador._take_bull_charge) so the ball pops instead of quietly goring.
+func is_rolling() -> bool:
+	return _active_ability == 3 and _ability_active
+
+
+# True while the dash ability is live. A dash is a committed lunge — it gores/rams on contact
+# regardless of angle (enemies bypass their horns-first cone while it's set).
+func is_dashing() -> bool:
+	return _active_ability == 1 and _ability_active
+
+
+# End the Powerball early: brake hard (the ball "pops" and unrolls) and drop back to the normal
+# locomotion path next frame.
 func _end_roll() -> void:
 	_ability_active = false
 	_active_ability = -1
@@ -612,27 +584,33 @@ func _hit_matadors_radius(range_m: float, strength: float, up_boost: float = 0.0
 		mat.call(&"apply_ability_hit", (away + Vector3.UP * 0.6).normalized(), strength, up_boost)
 
 
-# ── Particle helpers ──────────────────────────────────────────────────────────
+# ── Blood-spurt particle helpers ──────────────────────────────────────────────
-# All FX in this script use unshaded, vertex-coloured, alpha-blended particles;
+# The ability effects now live in systems/fx/; only the spear-wound blood below is still built in
-# these three helpers remove the boilerplate each spawn function used to repeat.
+# code. Shared material, built once so the mobile driver compiles this particle shader a single
-
+# time (colour comes per-particle from the colour_ramp via vertex colour, not this material).
 func _unshaded_material() -> StandardMaterial3D:
-	var mat := StandardMaterial3D.new()
+	if _unshaded_mat == null:
-	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+		_unshaded_mat = StandardMaterial3D.new()
-	mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
+		_unshaded_mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
-	mat.vertex_color_use_as_albedo = true
+		_unshaded_mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
-	mat.cull_mode = BaseMaterial3D.CULL_DISABLED
+		_unshaded_mat.vertex_color_use_as_albedo = true
-	return mat
+		_unshaded_mat.cull_mode = BaseMaterial3D.CULL_DISABLED
+	return _unshaded_mat
 
 
-# Low-poly sphere sized for a particle mesh (height is always the diameter).
+# Low-poly particle-sphere mesh (height = diameter), cached per size so repeats reuse one GPU upload.
 func _particle_sphere(radius: float, segments: int, rings: int, mat: Material) -> SphereMesh:
+	var key := "%.4f:%d:%d" % [radius, segments, rings]
+	var cached: SphereMesh = _particle_sphere_cache.get(key)
+	if cached != null:
+		return cached
 	var sphere := SphereMesh.new()
 	sphere.radius = radius
 	sphere.height = radius * 2.0
 	sphere.radial_segments = segments
 	sphere.rings = rings
 	sphere.material = mat
+	_particle_sphere_cache[key] = sphere
 	return sphere
 
 
@@ -645,281 +623,31 @@ func _free_after(node: Node, delay: float) -> void:
 
 
 func _spawn_slam_fx() -> void:
-	if not _slam_ring_mesh:
-		_slam_ring_mesh = _make_slam_ring_mesh()
-	var max_r  := DP.f("slam_range")
 	var origin := global_position + Vector3(0.0, -0.5, 0.0)
-	_launch_slam_ring(origin, max_r, 0.00, 0.55, Color(1.00, 0.70, 0.10, 0.85))
+	_impact_fx.call(&"slam_rings", origin, DP.f("slam_range"))
-	_launch_slam_ring(origin, max_r, 0.10, 0.52, Color(1.00, 0.50, 0.10, 0.65))
+	Fx.spawn(&"bull_slam", Transform3D(Basis(), origin))
-	_launch_slam_ring(origin, max_r, 0.20, 0.48, Color(0.90, 0.30, 0.10, 0.50))
-	_spawn_slam_dust(origin)
 	camera_pivot.call(&"trigger_hit", 0.60)
 
 
-func _launch_slam_ring(origin: Vector3, max_r: float,
-		delay: float, duration: float, col: Color) -> void:
-	var mat := StandardMaterial3D.new()
-	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
-	mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
-	mat.albedo_color = Color(col.r, col.g, col.b, 0.0)
-	mat.cull_mode    = BaseMaterial3D.CULL_DISABLED
-
-	var mi := MeshInstance3D.new()
-	mi.mesh              = _slam_ring_mesh
-	mi.material_override = mat
-	mi.scale             = Vector3(0.02, 1.0, 0.02)
-	get_parent().add_child(mi)
-	mi.global_position   = origin
-
-	var tween := create_tween()
-	tween.set_parallel(true)
-	tween.tween_property(mi, "scale",
-			Vector3(max_r, 1.0, max_r), duration)\
-		.set_delay(delay)\
-		.set_trans(Tween.TRANS_EXPO)\
-		.set_ease(Tween.EASE_OUT)
-	var fade := func(a: float) -> void: mat.albedo_color.a = a
-	tween.tween_method(fade, col.a, 0.0, duration)\
-		.set_delay(delay)\
-		.set_trans(Tween.TRANS_SINE)\
-		.set_ease(Tween.EASE_IN)
-	tween.tween_callback(mi.queue_free).set_delay(delay + duration + 0.05)
-
-
-func _spawn_slam_dust(origin: Vector3) -> void:
-	var sphere := _particle_sphere(0.09, 4, 2, _unshaded_material())
-
-	var ramp := Gradient.new()
-	ramp.set_color(0, Color(0.88, 0.74, 0.46, 1.0))
-	ramp.set_color(1, Color(0.88, 0.74, 0.46, 0.0))
-
-	var scale_curve := Curve.new()
-	scale_curve.add_point(Vector2(0.0, 0.25))
-	scale_curve.add_point(Vector2(0.35, 1.6))
-	scale_curve.add_point(Vector2(1.00, 0.0))
-
-	var p := CPUParticles3D.new()
-	p.one_shot             = true
-	p.explosiveness        = 0.85
-	p.amount               = 48
-	p.lifetime             = 1.1
-	p.randomness           = 0.5
-	p.local_coords         = false
-	p.direction            = Vector3.UP
-	p.spread               = 85.0
-	p.gravity              = Vector3(0.0, -7.0, 0.0)
-	p.initial_velocity_min = 3.5
-	p.initial_velocity_max = 10.0
-	p.scale_amount_min     = 0.5
-	p.scale_amount_max     = 2.0
-	p.mesh                 = sphere
-	p.color_ramp           = ramp
-	p.scale_amount_curve   = scale_curve
-	get_parent().add_child(p)
-	p.global_position = origin
-	p.restart()
-	_free_after(p, 2.5)
-
-
 func _spawn_kick_fx(back_dir: Vector3) -> void:
 	var origin := global_position + back_dir * 0.55 + Vector3(0.0, -0.25, 0.0)
-	_spawn_kick_dust(origin, back_dir)
+	Fx.spawn(&"bull_kick", _aimed_xform(origin, back_dir))
-	_spawn_kick_stones(origin, back_dir)
+	_impact_fx.call(&"kick_flash", origin)
-	_spawn_kick_sparks(origin, back_dir)
-	_spawn_kick_flash(origin)
 	camera_pivot.call(&"trigger_hit", 0.35)
 
 
-func _spawn_kick_dust(origin: Vector3, back_dir: Vector3) -> void:
-	var sphere := _particle_sphere(0.12, 4, 2, _unshaded_material())
-
-	var ramp := Gradient.new()
-	ramp.set_color(0, Color(1.0, 0.78, 0.18, 0.95))
-	ramp.set_color(1, Color(1.0, 0.45, 0.05, 0.0))
-
-	var scale_curve := Curve.new()
-	scale_curve.add_point(Vector2(0.0, 0.3))
-	scale_curve.add_point(Vector2(0.3, 1.5))
-	scale_curve.add_point(Vector2(1.0, 0.0))
-
-	var p := CPUParticles3D.new()
-	p.one_shot             = true
-	p.explosiveness        = 0.80
-	p.amount               = 40
-	p.lifetime             = 1.2
-	p.randomness           = 0.5
-	p.local_coords         = false
-	p.direction            = (back_dir + Vector3(0.0, 0.7, 0.0)).normalized()
-	p.spread               = 65.0
-	p.gravity              = Vector3(0.0, -6.0, 0.0)
-	p.initial_velocity_min = 3.0
-	p.initial_velocity_max = 9.0
-	p.scale_amount_min     = 0.5
-	p.scale_amount_max     = 2.2
-	p.mesh                 = sphere
-	p.color_ramp           = ramp
-	p.scale_amount_curve   = scale_curve
-	get_parent().add_child(p)
-	p.global_position = origin
-	p.restart()
-	_free_after(p, 2.5)
-
-
-func _spawn_kick_stones(origin: Vector3, back_dir: Vector3) -> void:
-	var sphere := _particle_sphere(0.055, 3, 1, _unshaded_material())
-
-	var ramp := Gradient.new()
-	ramp.set_color(0, Color(0.62, 0.58, 0.52, 1.0))
-	ramp.set_color(1, Color(0.62, 0.58, 0.52, 0.0))
-
-	var scale_curve := Curve.new()
-	scale_curve.add_point(Vector2(0.0, 1.0))
-	scale_curve.add_point(Vector2(0.6, 1.0))
-	scale_curve.add_point(Vector2(1.0, 0.0))
-
-	var p := CPUParticles3D.new()
-	p.one_shot             = true
-	p.explosiveness        = 0.92
-	p.amount               = 14
-	p.lifetime             = 0.65
-	p.randomness           = 0.6
-	p.local_coords         = false
-	p.direction            = (back_dir + Vector3(0.0, 0.35, 0.0)).normalized()
-	p.spread               = 45.0
-	p.gravity              = Vector3(0.0, -9.8, 0.0)
-	p.initial_velocity_min = 5.0
-	p.initial_velocity_max = 14.0
-	p.scale_amount_min     = 0.5
-	p.scale_amount_max     = 1.8
-	p.mesh                 = sphere
-	p.color_ramp           = ramp
-	p.scale_amount_curve   = scale_curve
-	get_parent().add_child(p)
-	p.global_position = origin
-	p.restart()
-	_free_after(p, 2.0)
-
-
-func _spawn_kick_flash(origin: Vector3) -> void:
-	var mat := _unshaded_material()
-	mat.albedo_color = Color(1.0, 0.97, 0.40, 0.0)
-
-	var sphere := _particle_sphere(1.0, 8, 4, mat)
-
-	var mi := MeshInstance3D.new()
-	mi.mesh              = sphere
-	mi.material_override = mat
-	mi.scale             = Vector3(0.05, 0.05, 0.05)
-	get_parent().add_child(mi)
-	mi.global_position = origin
-
-	var tween := create_tween()
-	tween.set_parallel(true)
-	tween.tween_property(mi, "scale", Vector3(0.7, 0.7, 0.7), 0.13)\
-		.set_trans(Tween.TRANS_EXPO).set_ease(Tween.EASE_OUT)
-	var fade := func(a: float) -> void: mat.albedo_color.a = a
-	tween.tween_method(fade, 0.92, 0.0, 0.14)\
-		.set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_IN)
-	tween.tween_callback(mi.queue_free).set_delay(0.16)
-
-
 func _spawn_dash_burst() -> void:
-	var box := BoxMesh.new()
+	Fx.spawn(&"bull_dash", _aimed_xform(global_position + Vector3(0.0, 0.2, 0.0), _dash_dir))
-	box.size = Vector3(0.045, 0.045, 0.30)
-	box.material = _unshaded_material()
-
-	var ramp := Gradient.new()
-	ramp.set_color(0, Color(0.50, 0.82, 1.0, 1.0))
-	ramp.set_color(1, Color(0.50, 0.82, 1.0, 0.0))
-
-	var scale_curve := Curve.new()
-	scale_curve.add_point(Vector2(0.0, 1.0))
-	scale_curve.add_point(Vector2(1.0, 0.0))
-
-	var p := CPUParticles3D.new()
-	p.one_shot             = true
-	p.explosiveness        = 0.92
-	p.amount               = 18
-	p.lifetime             = 0.22
-	p.randomness           = 0.15
-	p.local_coords         = false
-	p.direction            = _dash_dir
-	p.spread               = 15.0
-	p.gravity              = Vector3.ZERO
-	p.initial_velocity_min = 18.0
-	p.initial_velocity_max = 35.0
-	p.scale_amount_min     = 0.8
-	p.scale_amount_max     = 2.8
-	p.mesh                 = box
-	p.color_ramp           = ramp
-	p.scale_amount_curve   = scale_curve
-	get_parent().add_child(p)
-	p.global_position = global_position + Vector3(0.0, 0.2, 0.0)
-	p.restart()
-	_free_after(p, 0.6)
 
 
-func _spawn_kick_sparks(origin: Vector3, back_dir: Vector3) -> void:
+# A transform at `origin` whose local -Z faces `forward` (flattened to horizontal). The kick/dash
-	var sphere := _particle_sphere(0.04, 3, 1, _unshaded_material())
+# effects bake their spray in local space, so aiming the spawn transform points the burst the
-
+# right way. Falls back to an unrotated transform when `forward` has no horizontal component.
-	var ramp := Gradient.new()
+func _aimed_xform(origin: Vector3, forward: Vector3) -> Transform3D:
-	ramp.set_color(0, Color(1.0, 0.98, 0.60, 1.0))
+	var flat := Vector3(forward.x, 0.0, forward.z)
-	ramp.set_color(1, Color(1.0, 1.0, 1.0, 0.0))
+	if flat.length_squared() < 0.0001:
-
+		return Transform3D(Basis(), origin)
-	var scale_curve := Curve.new()
+	return Transform3D(Basis(), origin).looking_at(origin + flat.normalized(), Vector3.UP)
-	scale_curve.add_point(Vector2(0.0, 1.0))
-	scale_curve.add_point(Vector2(0.5, 0.6))
-	scale_curve.add_point(Vector2(1.0, 0.0))
-
-	var p := CPUParticles3D.new()
-	p.one_shot             = true
-	p.explosiveness        = 0.95
-	p.amount               = 22
-	p.lifetime             = 0.28
-	p.randomness           = 0.4
-	p.local_coords         = false
-	p.direction            = (back_dir + Vector3(0.0, 0.5, 0.0)).normalized()
-	p.spread               = 30.0
-	p.gravity              = Vector3(0.0, -14.0, 0.0)
-	p.initial_velocity_min = 8.0
-	p.initial_velocity_max = 18.0
-	p.scale_amount_min     = 0.6
-	p.scale_amount_max     = 2.0
-	p.mesh                 = sphere
-	p.color_ramp           = ramp
-	p.scale_amount_curve   = scale_curve
-	get_parent().add_child(p)
-	p.global_position = origin
-	p.restart()
-	_free_after(p, 1.0)
-
-
-func _make_slam_ring_mesh() -> ArrayMesh:
-	const INNER_R:  float = 0.82
-	const OUTER_R:  float = 1.00
-	const SEGMENTS: int   = 48
-
-	var verts   := PackedVector3Array()
-	var indices := PackedInt32Array()
-
-	for i: int in SEGMENTS:
-		var a0 := i       / float(SEGMENTS) * TAU
-		var a1 := (i + 1) / float(SEGMENTS) * TAU
-		var vi := i * 4
-		verts.append(Vector3(cos(a0) * INNER_R, 0.0, sin(a0) * INNER_R))
-		verts.append(Vector3(cos(a0) * OUTER_R, 0.0, sin(a0) * OUTER_R))
-		verts.append(Vector3(cos(a1) * OUTER_R, 0.0, sin(a1) * OUTER_R))
-		verts.append(Vector3(cos(a1) * INNER_R, 0.0, sin(a1) * INNER_R))
-		indices.append_array([vi, vi + 2, vi + 1, vi, vi + 3, vi + 2])
-
-	var arrays: Array = []
-	arrays.resize(Mesh.ARRAY_MAX)
-	arrays[Mesh.ARRAY_VERTEX] = verts
-	arrays[Mesh.ARRAY_INDEX]  = indices
-
-	var mesh := ArrayMesh.new()
-	mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)
-	return mesh
 
 
 func _physics_process(delta: float) -> void:
@@ -1009,13 +737,15 @@ func _physics_process(delta: float) -> void:
 		cube_guy.rotation.y = lerp_angle(
 			cube_guy.rotation.y, target_angle, delta * DP.f("visual_turn_speed"))
 
-	# Looping DASH clip while genuinely moving on the ground, idle otherwise.
+	# Looping WALK clip while genuinely moving on the ground, idle otherwise.
 	_update_locomotion_anim(on_floor and flat_speed > 1.0)
 
 	_pre_slide_vel_y = velocity.y
 	var pre_wall_vel := Vector3(velocity.x, 0.0, velocity.z)
 	move_and_slide()
 
+
+
 	# ── Wall bounce — no sliding, guaranteed exit ────────────────────────────
 	# pre_wall_vel is captured before move_and_slide strips the into-wall component,
 	# so into_spd correctly reflects how hard the bull hit the wall even when stationary.
@@ -1031,11 +761,14 @@ func _physics_process(delta: float) -> void:
 			velocity.z   = flat_n.z * exit_spd
 			pre_wall_vel = Vector3(velocity.x, 0.0, velocity.z)
 
-	# ── Bounce on landing ─────────────────────────────────────────────────────
+			# Ram straight through a barrel that formed the wall we bounced off.
+			var hit := col.get_collider()
+			if hit != null and hit.has_method(&"destroy_barrel"):
+				hit.call(&"destroy_barrel")
+
+	# ── Landing. Don't bounce ─────────────────────────────────────────────────────
 	if is_on_floor() and not _was_on_floor:
-		var impact := -_pre_slide_vel_y
+		velocity.y = 0.0
-		if impact > DP.f("bounce_min_impact") and not _slam_pending:
-			velocity.y = impact * DP.f("bounce_restitution")
 
 	# ── Slam landing ──────────────────────────────────────────────────────────
 	if _slam_pending and is_on_floor() and not _was_on_floor:
@@ -1048,6 +781,7 @@ func _physics_process(delta: float) -> void:
 		_play_idle()
 		_spawn_slam_fx()
 		_hit_matadors_radius(DP.f("slam_range"), DP.f("slam_strength"), DP.f("slam_launch_up"))
+		_smash_barrels_in_radius(DP.f("slam_range"))
 
 	# ── Dust ──────────────────────────────────────────────────────────────────
 	if flat_speed > DP.f("dust_charge_spd") and on_floor:
@@ -1063,8 +797,6 @@ func _physics_process(delta: float) -> void:
 		if vel_flat.length_squared() > 0.1:
 			_charge_trail_emitter.direction = (-vel_flat.normalized() + Vector3(0.0, 0.25, 0.0)).normalized()
 
-	# ── Hoof sounds ───────────────────────────────────────────────────────────
-
 
 func get_hp() -> int:
 	return _hp
@@ -1074,6 +806,22 @@ func get_max_hp() -> int:
 	return _max_hp
 
 
+# Bonus pips currently on the bar — the HUD colours this many top pips yellow.
+func get_bonus_hp() -> int:
+	return _bonus_hp
+
+
+# Award extra health (from a lobby reward): grows both the cap and the current bar so the
+# new pips arrive full, and marks them as bonus so the HUD paints them yellow.
+func grant_bonus_hp(amount: int) -> void:
+	if amount <= 0:
+		return
+	_bonus_hp += amount
+	_max_hp   += amount
+	_hp       += amount
+	health_changed.emit(_hp, _max_hp)
+
+
 # A clean hit — thrown or swung blade — costs the bull one HP pip; the run ends only
 # when the last pip is gone. `cause` ("gored" / "thrown") tags how it happened for the
 # death notice. I-frames absorb a flurry so several blades in one pass drop one pip,
@@ -1082,10 +830,15 @@ func take_sword_hit(cause: String = "", hit_pos: Vector3 = Vector3.ZERO) -> void
 	if _dead or _hit_iframes > 0.0:
 		return
 	_hp -= 1
+	_hit_flash()
 	_hit_iframes = DP.f("bull_hit_iframes")
 	health_changed.emit(_hp, _max_hp)
 	hit_taken.emit(cause)
 	camera_pivot.call(&"trigger_hit", 0.7)
+	# Vibrate controller 0 with half weak strength, full strong strength, for 0.5 seconds
+	if DP.b("gamepad_vibration"):
+		Input.start_joy_vibration(0, 0.5, 1, 0.2)
+
 	# A spear gores a spot — blood spurts from the entry wound (where it struck the
 	# bull). Melee gores pass no position and skip the spurt; gore can be turned off.
 	if cause == "thrown" and Settings.gore:
@@ -1101,6 +854,21 @@ func take_sword_hit(cause: String = "", hit_pos: Vector3 = Vector3.ZERO) -> void
 		died.emit(cause)
 
 
+# Pop the bull upward — a smash hitbox knocks it off its feet. Only ever raises the
+# vertical speed so a downward-moving bull still gets launched.
+func apply_knock_up(v: float) -> void:
+	velocity.y = maxf(velocity.y, v)
+
+
+# Typed entry point for the unified hit pipeline: a Hitbox (or any attacker) hands the bull a
+# DamageEvent instead of calling take_sword_hit directly. A thin adapter over the existing pip /
+# knock-up logic, so behaviour is unchanged while callers migrate off the stringly path.
+func receive_damage(event: DamageEvent) -> void:
+	take_sword_hit(event.cause_name(), event.hit_position)
+	if event.knock_up > 0.0:
+		apply_knock_up(event.knock_up)
+
+
 # Blood spurt from a spear wound: a short-lived spray of dark-red gobs flung out of the
 # entry point, biased outward from the bull's centre (so it reads as bursting from the
 # hide) with a touch of lift before gravity drags it down.
@@ -1142,3 +910,35 @@ func _spawn_blood(hit_pos: Vector3) -> void:
 	p.global_position = hit_pos
 	p.restart()
 	_free_after(p, 1.5)
+
+
+func _hit_flash() -> void:
+	var meshes := find_children("*", "MeshInstance3D", true, false)
+
+	for node in meshes:
+		var mesh := node as MeshInstance3D
+		if mesh:
+			mesh.material_overlay = _make_hit_overlay()
+
+	if _hit_flash_tween:
+		_hit_flash_tween.kill()
+
+	_hit_flash_tween = create_tween()
+	_hit_flash_tween.tween_interval(0.08)
+	_hit_flash_tween.tween_callback(_clear_hit_flash)
+
+
+func _make_hit_overlay() -> StandardMaterial3D:
+	var mat := StandardMaterial3D.new()
+	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+	mat.albedo_color = Color(1.0, 0.03, 0.03, 1.0)
+	return mat
+
+
+func _clear_hit_flash() -> void:
+	var meshes := find_children("*", "MeshInstance3D", true, false)
+
+	for node in meshes:
+		var mesh := node as MeshInstance3D
+		if mesh:
+			mesh.material_overlay = null

actors/player/player.tscn

@@ -0,0 +1,52 @@
+[gd_scene format=3 uid="uid://crtm0xtiql3r8"]
+
+[ext_resource type="Script" uid="uid://bn777gguclud5" path="res://actors/player/player.gd" id="1_xhfnw"]
+[ext_resource type="Script" uid="uid://cpyq2r5cq653g" path="res://actors/player/camera_iso.gd" id="2_camera_iso"]
+[ext_resource type="PackedScene" uid="uid://bun14xmk20pcj" path="res://art/characters/bull.fbx" id="4_e80uo"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kne1u"]
+radius = 0.7495117
+height = 1.845398
+
+[node name="Player" type="CharacterBody3D" unique_id=165510044]
+collision_layer = 2
+collision_mask = 9
+script = ExtResource("1_xhfnw")
+
+[node name="CollisionBull" type="CollisionShape3D" parent="." unique_id=571780801]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.29183745, 0.3197594)
+shape = SubResource("CapsuleShape3D_kne1u")
+
+[node name="Camera3D" type="Camera3D" parent="." unique_id=1120161087]
+script = ExtResource("2_camera_iso")
+
+[node name="bull" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23)
+
+[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 1057197468) index="0" unique_id=840295370]
+bones/0/position = Vector3(0, 0, 0.009963839)
+bones/0/rotation = Quaternion(0.7071068, 0, 0, 0.7071067)
+bones/0/scale = Vector3(1, 1, 1)
+bones/1/position = Vector3(0.003526625, -0.0043296535, 0.0040827994)
+bones/1/rotation = Quaternion(-0.00038647873, 0.06909673, 0.9868542, -0.14609687)
+bones/2/rotation = Quaternion(-0.06929122, 3.2175163e-07, -0.112670615, 0.99121344)
+bones/4/position = Vector3(0.0045358227, -0.002137695, -0.004238624)
+bones/4/rotation = Quaternion(-0.24948503, 0.19590352, 0.9416978, -0.11217985)
+bones/4/scale = Vector3(1.0000001, 0.9999999, 1.0000001)
+bones/5/rotation = Quaternion(-0.58943665, -0.3660725, -0.22564478, 0.683842)
+bones/5/scale = Vector3(1, 1.0000001, 0.99999994)
+bones/6/rotation = Quaternion(0.52910197, 0.15997827, 0.120245, 0.8246207)
+bones/6/scale = Vector3(1, 1, 1.0000001)
+bones/17/position = Vector3(0, 0.0009373814, 0.007552617)
+bones/17/rotation = Quaternion(-9.4156974e-08, 0.7071068, 0.7071067, -9.4156974e-08)
+bones/19/position = Vector3(-0.003526625, -0.0043296535, 0.0040827994)
+bones/19/rotation = Quaternion(0.00038647873, 0.06909673, 0.9868542, 0.14609687)
+bones/20/rotation = Quaternion(-0.06929122, -3.2227587e-07, 0.11267061, 0.99121344)
+bones/22/position = Vector3(-0.0045358227, -0.002137695, -0.004238624)
+bones/22/rotation = Quaternion(0.24948503, 0.19590352, 0.9416978, 0.11217985)
+bones/23/rotation = Quaternion(-0.58943665, 0.3660725, 0.22564478, 0.683842)
+bones/23/scale = Vector3(1, 1.0000001, 1)
+bones/24/rotation = Quaternion(0.529102, -0.15997836, -0.120245025, 0.82462066)
+bones/24/scale = Vector3(1, 1.0000001, 1)
+
+[editable path="bull"]

actors/player/player_follow_light.gd

@@ -0,0 +1,14 @@
+extends Node3D
+
+var player: Node3D = null
+
+func _process(delta: float) -> void:
+	# If we don't have the player yet, try to find them in the group
+	if not is_instance_valid(player):
+		var players = get_tree().get_nodes_in_group("player")
+		if players.size() > 0:
+			player = players[0] as Node3D
+	
+	# If the player exists, follow their position
+	if is_instance_valid(player):
+		global_position = player.global_position

actors/player/player_follow_light.gd.uid

@@ -0,0 +1 @@
+uid://cmapsaj010q40

actors/player/player_follow_light.tscn

@@ -0,0 +1,14 @@
+[gd_scene format=3 uid="uid://4v25hb0qu5l0"]
+
+[ext_resource type="Script" uid="uid://cmapsaj010q40" path="res://actors/player/player_follow_light.gd" id="1_w7wrt"]
+
+[node name="PlayerFollowLight" type="Node3D" unique_id=1889971494]
+script = ExtResource("1_w7wrt")
+
+[node name="SpotLight3D" type="SpotLight3D" parent="." unique_id=1523840927]
+transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 2.6136062, 1.0431258e-07)
+light_color = Color(0.9999998, 0.8702623, 0.60548127, 1)
+light_energy = 8.0
+shadow_enabled = true
+distance_fade_length = 30.45
+spot_angle = 72.62192

addons/rider-plugin/plugin.cfg

@@ -8,5 +8,5 @@ script="rider-plugin.gd"
 
 [presets]
 
-active="off"
+active="on"
 presets="presets.json"

animation_tree.gd.uid

@@ -1 +0,0 @@
-uid://sbf260u32upu

art/anim/crowd_clap.glb.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://cmxqocsdbgufr"
-path="res://.godot/imported/mees_plaksutab.glb-0ce4e4ee8c8f92069abfac9352f0f4b9.scn"
+path="res://.godot/imported/crowd_clap.glb-8bb3f532af711440142a67228d380ce0.scn"
 
 [deps]
 
-source_file="res://Animations/mees_plaksutab.glb"
+source_file="res://art/anim/crowd_clap.glb"
-dest_files=["res://.godot/imported/mees_plaksutab.glb-0ce4e4ee8c8f92069abfac9352f0f4b9.scn"]
+dest_files=["res://.godot/imported/crowd_clap.glb-8bb3f532af711440142a67228d380ce0.scn"]
 
 [params]
 

art/blender/create_matador_anims.py

@@ -1,6 +1,6 @@
 """
-Blender 5.1 script: create walk + idle animations for matador_v02.
+Blender 5.1 script: create walk + idle animations for matador.
-Run:  blender --background matador_v02.blend --python create_matador_anims.py
+Run:  blender --background matador.blend --python create_matador_anims.py
 """
 import bpy, math, os
 
@@ -130,7 +130,7 @@ ti.name = 'idle'
 si = ti.strips.new('idle', 0, idle)
 
 # ── export FBX ─────────────────────────────────────────────────────────────────
-fbx_path = os.path.join(os.path.dirname(bpy.data.filepath), 'matador_v02.fbx')
+fbx_path = os.path.join(os.path.dirname(bpy.data.filepath), 'matador.fbx')
 bpy.ops.export_scene.fbx(
     filepath=fbx_path,
     use_selection=False,

art/blender/render_anim_preview.py

@@ -1,8 +1,8 @@
 """
 Blender 5.1 script: render preview frames of matador animations to PNG.
-Run:  blender --background matador_v02.blend --python render_anim_preview.py
+Run:  blender --background matador.blend --python render_anim_preview.py
 
-Outputs to Blender/preview/ directory:
+Outputs to art/blender/preview/ directory:
   walk_frame_00.png .. walk_frame_09.png
   idle_frame_00.png
 

art/characters/bear.glb.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://cofv5dbavesis"
-path="res://.godot/imported/Bear.glb-d982be4b426919de19c028d884069d30.scn"
+path="res://.godot/imported/bear.glb-75dd9ad1d0d42d959c02624cfc22996d.scn"
 
 [deps]
 
-source_file="res://Assets/Bear.glb"
+source_file="res://art/characters/bear.glb"
-dest_files=["res://.godot/imported/Bear.glb-d982be4b426919de19c028d884069d30.scn"]
+dest_files=["res://.godot/imported/bear.glb-75dd9ad1d0d42d959c02624cfc22996d.scn"]
 
 [params]
 

art/characters/bull.fbx.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://bun14xmk20pcj"
-path="res://.godot/imported/bull.fbx-50f6d03a92c862695bbeaeba563be0db.scn"
+path="res://.godot/imported/bull.fbx-ffca5aad6fa2fef7c6aaeff23784274e.scn"
 
 [deps]
 
-source_file="res://Assets/bull.fbx"
+source_file="res://art/characters/bull.fbx"
-dest_files=["res://.godot/imported/bull.fbx-50f6d03a92c862695bbeaeba563be0db.scn"]
+dest_files=["res://.godot/imported/bull.fbx-ffca5aad6fa2fef7c6aaeff23784274e.scn"]
 
 [params]
 

art/characters/matador.glb.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://eu2lqjhowj4t"
-path="res://.godot/imported/Matador.glb-84387af784b13addc4467fc8edace9ff.scn"
+path="res://.godot/imported/matador.glb-d61955edf618ff60a81602b44843dd9c.scn"
 
 [deps]
 
-source_file="res://Assets/Matador.glb"
+source_file="res://art/characters/matador.glb"
-dest_files=["res://.godot/imported/Matador.glb-84387af784b13addc4467fc8edace9ff.scn"]
+dest_files=["res://.godot/imported/matador.glb-d61955edf618ff60a81602b44843dd9c.scn"]
 
 [params]
 

art/fonts/Cinzel.ttf.import

@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://fu84fchl1im6"
-path="res://.godot/imported/Cinzel.ttf-b9b78caa7497d2ec78b922cb77f34333.fontdata"
+path="res://.godot/imported/Cinzel.ttf-95f91c70d492f60cef14788d0547dff4.fontdata"
 
 [deps]
 
-source_file="res://fonts/Cinzel.ttf"
+source_file="res://art/fonts/Cinzel.ttf"
-dest_files=["res://.godot/imported/Cinzel.ttf-b9b78caa7497d2ec78b922cb77f34333.fontdata"]
+dest_files=["res://.godot/imported/Cinzel.ttf-95f91c70d492f60cef14788d0547dff4.fontdata"]
 
 [params]
 

art/fonts/CinzelDecorative-Bold.ttf.import

@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://rcfn6xhs7fur"
-path="res://.godot/imported/CinzelDecorative-Bold.ttf-fd8dd0c7ef2ceb6acaeb4b78a3c0a47b.fontdata"
+path="res://.godot/imported/CinzelDecorative-Bold.ttf-71cca077ba75a6c829f53e2548a2580d.fontdata"
 
 [deps]
 
-source_file="res://fonts/CinzelDecorative-Bold.ttf"
+source_file="res://art/fonts/CinzelDecorative-Bold.ttf"
-dest_files=["res://.godot/imported/CinzelDecorative-Bold.ttf-fd8dd0c7ef2ceb6acaeb4b78a3c0a47b.fontdata"]
+dest_files=["res://.godot/imported/CinzelDecorative-Bold.ttf-71cca077ba75a6c829f53e2548a2580d.fontdata"]
 
 [params]
 

art/fx/bear_fx.glb.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://2e6fbder27w1"
+uid="uid://bdbx0wwa73rhp"
-path="res://.godot/imported/cubes_fx_test.glb-29490ce7011d666c1c4917a1a92679e4.scn"
+path="res://.godot/imported/bear_fx.glb-ec36223896f7444a4dbe06fe70380d22.scn"
 
 [deps]
 
-source_file="res://Assets/fx/cubes_fx_test.glb"
+source_file="res://art/fx/bear_fx.glb"
-dest_files=["res://.godot/imported/cubes_fx_test.glb-29490ce7011d666c1c4917a1a92679e4.scn"]
+dest_files=["res://.godot/imported/bear_fx.glb-ec36223896f7444a4dbe06fe70380d22.scn"]
 
 [params]