Complete the DamageEvent migration: one deal() entry point for every attacker

The bull's Hitbox already routed through DamageEvent, but the spear, the bear's maul, and the matador's reach-gore still did raw Object.call(&"take_sword_hit", ...) — the exact scattered string paths DamageEvent was meant to retire. Add a single static DamageEvent.deal(target, cause, at, source, knock_up) that builds the typed event and hands it to receive_damage(), falling back to the legacy string call for any not-yet-migrated victim, and route all four attackers (Hitbox included) through it. The damage_pipeline characterization test proves the bull's outcomes are unchanged. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Pq1VX2o1ZfiNRdCjD294wf
Fix stale logic-test reference to renamed param
2026-09-05 10:52:10 +03:00 · 2026-09-05 00:19:19 +03:00 · 2026-09-05 00:18:21 +03:00 · 2026-09-05 00:17:04 +03:00 · 2026-09-05 00:13:43 +03:00 · 2026-09-05 00:13:23 +03:00
212 changed files with 24506 additions and 1793 deletions
@@ -2,4 +2,4 @@ disable:
  - class-definitions-order
  - no-else-return
 max-line-length: 120
-max-file-lines: 1200
+max-file-lines: 3000
@@ -0,0 +1,52 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    name: Lint & headless tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Mirror the local toolchain (godot --version → 4.7.beta). If this exact tag is not published,
+      # pin it to the 4.7 beta the team actually runs; setup-godot maps this to a Godot release tag.
+      - name: Install Godot 4.7
+        uses: chickensoft-games/setup-godot@v2
+        with:
+          version: 4.7.0-beta
+          use-dotnet: false
+          include-templates: false
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install gdlint (gdtoolkit)
+        run: pip install "gdtoolkit==4.*"
+
+      # First run imports assets and builds the .godot cache (gitignored), so the headless tests can
+      # actually load the .glb/.png resources they instance. Import can exit non-zero on warnings.
+      - name: Import resources
+        run: godot --headless --import
+        continue-on-error: true
+
+      - name: gdlint
+        run: gdlint *.gd levels/*.gd tests/*.gd
+
+      - name: Headless tests
+        env:
+          GODOT: godot
+        run: bash run_tests.sh --no-gameplay
+
+      - 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
@@ -2,6 +2,9 @@
 .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/

@@ -0,0 +1,93 @@
+[gd_resource type="Animation" format=3 uid="uid://bq71flatfddll"]
+
+[resource]
+resource_name = "Bear_fx_smash_hit"
+length = 0.23333333
+tracks/0/type = "position_3d"
+tracks/0/imported = true
+tracks/0/enabled = true
+tracks/0/path = NodePath("Bear_fx_smash_hit")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = PackedFloat32Array(0, 1, 0, -0.51246816, 7.1560388, 0.033333335, 1, 0, -0.51246816, 7.1560388, 0.06666667, 1, 1.2735307, -1.4730668, 5.139501, 0.1, 1, 1.3610363, 0.27301335, 5.141279, 0.13333334, 1, 1.3735371, 2.1639488, 5.153728, 0.16666667, 1, 1.3573295, -0.04170864, 5.1945124, 0.2, 1, 1.3061407, -0.3338372, 5.1877995, 0.23333333, 1, 1.2735307, -0.37556988, 5.1810856)
+tracks/1/type = "rotation_3d"
+tracks/1/imported = true
+tracks/1/enabled = true
+tracks/1/path = NodePath("Bear_fx_smash_hit")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1, 0.033333335, 1, 0, 0, 0, 1, 0.06666667, 1, 0.045591418, -0.036703378, -0.0016762356, 0.9982843, 0.1, 1, 0.06741002, -0.02538766, 0.014408795, 0.99729824, 0.13333334, 1, 0.05603578, -0.017236687, 0.029419938, 0.99784636, 0.16666667, 1, -0.071329094, -0.014488678, 0.036211126, 0.9966901, 0.23333333, 1, -0.039237745, -0.015645763, 0.035726424, 0.99846846)
+tracks/2/type = "scale_3d"
+tracks/2/imported = true
+tracks/2/enabled = true
+tracks/2/path = NodePath("Bear_fx_smash_hit")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = PackedFloat32Array(0, 1, 0, 0, 0, 0.033333335, 1, 0, 0, 0, 0.06666667, 1, 0.55657715, 0.55657715, 0.5565772, 0.23333333, 1, 0.55657715, 0.55657715, 0.55657715)
+tracks/3/type = "position_3d"
+tracks/3/imported = true
+tracks/3/enabled = true
+tracks/3/path = NodePath("Bear_fx_jump_smash")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = PackedFloat32Array(0, 1, 0, -0.51246816, 0)
+tracks/4/type = "scale_3d"
+tracks/4/imported = true
+tracks/4/enabled = true
+tracks/4/path = NodePath("Bear_fx_jump_smash")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = PackedFloat32Array(0, 1, 0, 0, 0)
+tracks/5/type = "position_3d"
+tracks/5/imported = true
+tracks/5/enabled = true
+tracks/5/path = NodePath("Bear_fx_claw_attack_R")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = PackedFloat32Array(0, 1, -3.188013, 1.0970955, 1.7545929)
+tracks/6/type = "rotation_3d"
+tracks/6/imported = true
+tracks/6/enabled = true
+tracks/6/path = NodePath("Bear_fx_claw_attack_R")
+tracks/6/interp = 1
+tracks/6/loop_wrap = true
+tracks/6/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1)
+tracks/7/type = "scale_3d"
+tracks/7/imported = true
+tracks/7/enabled = true
+tracks/7/path = NodePath("Bear_fx_claw_attack_R")
+tracks/7/interp = 1
+tracks/7/loop_wrap = true
+tracks/7/keys = PackedFloat32Array(0, 1, 0, 0, 0)
+tracks/8/type = "position_3d"
+tracks/8/imported = true
+tracks/8/enabled = true
+tracks/8/path = NodePath("Bear_fx_claw_attack_L")
+tracks/8/interp = 1
+tracks/8/loop_wrap = true
+tracks/8/keys = PackedFloat32Array(0, 1, -3.188013, 1.0970955, 1.7545929)
+tracks/9/type = "rotation_3d"
+tracks/9/imported = true
+tracks/9/enabled = true
+tracks/9/path = NodePath("Bear_fx_claw_attack_L")
+tracks/9/interp = 1
+tracks/9/loop_wrap = true
+tracks/9/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1)
+tracks/10/type = "scale_3d"
+tracks/10/imported = true
+tracks/10/enabled = true
+tracks/10/path = NodePath("Bear_fx_claw_attack_L")
+tracks/10/interp = 1
+tracks/10/loop_wrap = true
+tracks/10/keys = PackedFloat32Array(0, 1, 0, 0, 0)
+tracks/11/type = "method"
+tracks/11/imported = false
+tracks/11/enabled = true
+tracks/11/path = NodePath("..")
+tracks/11/interp = 1
+tracks/11/loop_wrap = true
+tracks/11/keys = {
+"times": PackedFloat32Array(),
+"transitions": PackedFloat32Array(),
+"values": []
+}
@@ -4,8 +4,9 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://dk6xuwwa0mfpe"
 path.s3tc="res://.godot/imported/Arena_sand.png-416de2afe03241df088061e1a5f831af.s3tc.ctex"
+path.etc2="res://.godot/imported/Arena_sand.png-416de2afe03241df088061e1a5f831af.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={
@@ -15,7 +16,7 @@ generator_parameters={
 [deps]

 source_file="res://Assets/Arena_sand.png"
-dest_files=["res://.godot/imported/Arena_sand.png-416de2afe03241df088061e1a5f831af.s3tc.ctex"]
+dest_files=["res://.godot/imported/Arena_sand.png-416de2afe03241df088061e1a5f831af.s3tc.ctex", "res://.godot/imported/Arena_sand.png-416de2afe03241df088061e1a5f831af.etc2.ctex"]

 [params]

@@ -4,8 +4,9 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://b4gkpa7jypcsm"
 path.s3tc="res://.godot/imported/Arena_wall.png-e67bd4bbd2f60583bfc14dd8b7687eef.s3tc.ctex"
+path.etc2="res://.godot/imported/Arena_wall.png-e67bd4bbd2f60583bfc14dd8b7687eef.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={
@@ -15,7 +16,7 @@ generator_parameters={
 [deps]

 source_file="res://Assets/Arena_wall.png"
-dest_files=["res://.godot/imported/Arena_wall.png-e67bd4bbd2f60583bfc14dd8b7687eef.s3tc.ctex"]
+dest_files=["res://.godot/imported/Arena_wall.png-e67bd4bbd2f60583bfc14dd8b7687eef.s3tc.ctex", "res://.godot/imported/Arena_wall.png-e67bd4bbd2f60583bfc14dd8b7687eef.etc2.ctex"]

 [params]

@@ -4,8 +4,9 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://yercpq3y2o0x"
 path.s3tc="res://.godot/imported/Arena_wood.png-b4ed20d66b4d375396b0be2f2f863d80.s3tc.ctex"
+path.etc2="res://.godot/imported/Arena_wood.png-b4ed20d66b4d375396b0be2f2f863d80.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={
@@ -15,7 +16,7 @@ generator_parameters={
 [deps]

 source_file="res://Assets/Arena_wood.png"
-dest_files=["res://.godot/imported/Arena_wood.png-b4ed20d66b4d375396b0be2f2f863d80.s3tc.ctex"]
+dest_files=["res://.godot/imported/Arena_wood.png-b4ed20d66b4d375396b0be2f2f863d80.s3tc.ctex", "res://.godot/imported/Arena_wood.png-b4ed20d66b4d375396b0be2f2f863d80.etc2.ctex"]

 [params]

@@ -0,0 +1,40 @@
+[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
@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://dxe72ig8gfbcg"
-path="res://.godot/imported/arena model2026.glb-299db01cae891e5005f8ac1e6c83d0a6.scn"
+uid="uid://cwmo5vh738x6w"
+path="res://.godot/imported/Lobby_level.glb-a7e896ecf7377d9530a80d5e63140cc3.scn"

 [deps]

-source_file="res://Assets/arena model2026.glb"
-dest_files=["res://.godot/imported/arena model2026.glb-299db01cae891e5005f8ac1e6c83d0a6.scn"]
+source_file="res://Assets/Lobby_level.glb"
+dest_files=["res://.godot/imported/Lobby_level.glb-a7e896ecf7377d9530a80d5e63140cc3.scn"]

 [params]

@@ -0,0 +1,45 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://xtv6u00w4nmy"
+path.s3tc="res://.godot/imported/Lobby_level_sand.png-bb70b0169c6b5159e020ce143afe9786.s3tc.ctex"
+path.etc2="res://.godot/imported/Lobby_level_sand.png-bb70b0169c6b5159e020ce143afe9786.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "c8b9b7d6205ce80dfcfaa38152b996fe"
+}
+
+[deps]
+
+source_file="res://Assets/Lobby_level_sand.png"
+dest_files=["res://.godot/imported/Lobby_level_sand.png-bb70b0169c6b5159e020ce143afe9786.s3tc.ctex", "res://.godot/imported/Lobby_level_sand.png-bb70b0169c6b5159e020ce143afe9786.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+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=true
+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=0
@@ -0,0 +1,45 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://csy5f3l5lufp5"
+path.s3tc="res://.godot/imported/Lobby_level_wall.png-39243638bfc6ea5742b6e2fdc927ae2c.s3tc.ctex"
+path.etc2="res://.godot/imported/Lobby_level_wall.png-39243638bfc6ea5742b6e2fdc927ae2c.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "0e7ed34c3c812d96732bd32f9dca0c93"
+}
+
+[deps]
+
+source_file="res://Assets/Lobby_level_wall.png"
+dest_files=["res://.godot/imported/Lobby_level_wall.png-39243638bfc6ea5742b6e2fdc927ae2c.s3tc.ctex", "res://.godot/imported/Lobby_level_wall.png-39243638bfc6ea5742b6e2fdc927ae2c.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+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=true
+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=0
@@ -0,0 +1,45 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ym5273astq46"
+path.s3tc="res://.godot/imported/Lobby_level_wood.png-4817792c09af3fd5e04ad29e0f9bd0ce.s3tc.ctex"
+path.etc2="res://.godot/imported/Lobby_level_wood.png-4817792c09af3fd5e04ad29e0f9bd0ce.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "23a7a951553ffe271c47693fd71314ca"
+}
+
+[deps]
+
+source_file="res://Assets/Lobby_level_wood.png"
+dest_files=["res://.godot/imported/Lobby_level_wood.png-4817792c09af3fd5e04ad29e0f9bd0ce.s3tc.ctex", "res://.godot/imported/Lobby_level_wood.png-4817792c09af3fd5e04ad29e0f9bd0ce.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+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=true
+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=0
@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dctmlh4hnuux1"
+path="res://.godot/imported/Lobby_underground.glb-55ed49331d7074ef560bfa0a498b89a7.scn"
+
+[deps]
+
+source_file="res://Assets/Lobby_underground.glb"
+dest_files=["res://.godot/imported/Lobby_underground.glb-55ed49331d7074ef560bfa0a498b89a7.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1
@@ -0,0 +1,45 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dc4gf36fgsabp"
+path.s3tc="res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.s3tc.ctex"
+path.etc2="res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "de3796fe2c1123ae5ba27a0532fda6bd"
+}
+
+[deps]
+
+source_file="res://Assets/Lobby_underground_rock.png"
+dest_files=["res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.s3tc.ctex", "res://.godot/imported/Lobby_underground_rock.png-76733dc5212e6c79a91e71ce008ebf6f.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+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=true
+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=0
@@ -0,0 +1,45 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://v0hdo12xule3"
+path.s3tc="res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.s3tc.ctex"
+path.etc2="res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "335b739e743244a64c47e2564a9a3652"
+}
+
+[deps]
+
+source_file="res://Assets/Lobby_underground_rock_B.jpg"
+dest_files=["res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.s3tc.ctex", "res://.godot/imported/Lobby_underground_rock_B.jpg-c5e86461201f99688c8146fff239a62b.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+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=true
+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=0
@@ -0,0 +1,45 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dcy7fdio5k84j"
+path.s3tc="res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.s3tc.ctex"
+path.etc2="res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "16ea5e4b01e9b3952b950ff65535e5d5"
+}
+
+[deps]
+
+source_file="res://Assets/Lobby_underground_rock_B.png"
+dest_files=["res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.s3tc.ctex", "res://.godot/imported/Lobby_underground_rock_B.png-3133a2540f4e1417fb5588bad79e38c8.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+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=true
+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=0
@@ -28,7 +28,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
-meshes/force_disable_compression=false
+meshes/force_disable_compression=true
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bm6rmt3xprhjs"
+path="res://.godot/imported/bear_level_arena.glb-b6a9df3b338c8b0345fe2642d8b715eb.scn"
+
+[deps]
+
+source_file="res://Assets/bear_level_arena.glb"
+dest_files=["res://.godot/imported/bear_level_arena.glb-b6a9df3b338c8b0345fe2642d8b715eb.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1
@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dnltsqmuqcxh1"
+path="res://.godot/imported/Barrel.glb-8809615fbcbd5dc5b64a229316967555.scn"
+
+[deps]
+
+source_file="res://Assets/breakables/Barrel.glb"
+dest_files=["res://.godot/imported/Barrel.glb-8809615fbcbd5dc5b64a229316967555.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1
@@ -28,7 +28,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
-meshes/force_disable_compression=false
+meshes/force_disable_compression=true
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dct1d88g015el"
+path="res://.godot/imported/kleeps_v2.png-55aa0dd25620611263a8b3000c5e2a49.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/kleeps_v2.png"
+dest_files=["res://.godot/imported/kleeps_v2.png-55aa0dd25620611263a8b3000c5e2a49.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
@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bh5nuyudh7x44"
+path="res://.godot/imported/loading_screen.png-253743b71eb7ab3f4f9e2b29cbabf407.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/loading_screen.png"
+dest_files=["res://.godot/imported/loading_screen.png-253743b71eb7ab3f4f9e2b29cbabf407.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
@@ -0,0 +1,15 @@
+extends Node3D
+## Lobby geometry — watches the run state and raises the bear-gate grid once the arena has
+## been cleared. The DP flag stays as a designer override for testing the animation.
+
+var bear_gate_open := false
+
+
+func _process(_delta: float) -> void:
+	if bear_gate_open:
+		return
+	if Run.bear_gate_open() or DP.b("gate_unlocked_bear"):
+		bear_gate_open = true
+		$AnimationPlayer.play("Gate_opening")
+		if DP.b("gamepad_vibration"):
+			Input.start_joy_vibration(0, 0.5, .5, 7)
@@ -0,0 +1 @@
+uid://cwbf7jfkr8j10
@@ -1,5 +0,0 @@
-extends Node3D
-
-
-func _ready() -> void:
-	$AnimationPlayer.play("Taunt")
@@ -1 +0,0 @@
-uid://bn3xwnlktwdlf
@@ -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)
@@ -0,0 +1,44 @@
+[gd_scene format=3 uid="uid://o8ocjfprxa7u"]
+
+[ext_resource type="Script" uid="uid://cn7fhjkro7637" path="res://bear.gd" id="1_beargd"]
+[ext_resource type="PackedScene" uid="uid://cofv5dbavesis" path="res://Assets/Bear.glb" id="2_bearglb"]
+[ext_resource type="PackedScene" uid="uid://bdbx0wwa73rhp" path="res://Assets/fx/Bear_FX.glb" id="3_bearfx"]
+[ext_resource type="Material" uid="uid://blpkmyikjnhbo" path="res://Materials/M_bear_claw_fx.tres" id="4_clawfx"]
+[ext_resource type="PackedScene" path="res://BearAttackHitboxes.tscn" id="5_hitboxes"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_body"]
+radius = 1.0
+height = 2.4
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_hit"]
+radius = 1.3
+height = 2.7
+
+[node name="Bear" type="CharacterBody3D" unique_id=1573237287]
+script = ExtResource("1_beargd")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=830443382]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2, 0)
+shape = SubResource("CapsuleShape3D_body")
+
+[node name="HitArea" type="Area3D" parent="." unique_id=365327397]
+monitorable = false
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="HitArea" unique_id=2111867348]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.35, 0)
+shape = SubResource("CapsuleShape3D_hit")
+
+[node name="bear_model" parent="." unique_id=359217823 instance=ExtResource("2_bearglb")]
+
+[node name="Bear_FX" parent="bear_model" unique_id=2070553519 instance=ExtResource("3_bearfx")]
+
+[node name="Bear_fx_claw_attack_R" parent="bear_model/Bear_FX" index="2" unique_id=1939248432]
+surface_material_override/0 = ExtResource("4_clawfx")
+
+[node name="Bear_fx_claw_attack_L" parent="bear_model/Bear_FX" index="3" unique_id=834640978]
+surface_material_override/0 = ExtResource("4_clawfx")
+
+[node name="AttackHitboxes" parent="bear_model" instance=ExtResource("5_hitboxes")]
+
+[editable path="bear_model"]
+[editable path="bear_model/Bear_FX"]
@@ -0,0 +1,70 @@
+[gd_scene format=3]
+
+[ext_resource type="Script" path="res://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")
@@ -12,14 +12,32 @@ I am a **Godot 4.6+ expert**. I follow current best practices for GDScript, scen

 | Path | Purpose |
 |---|---|
-| `scene.tscn` | Main scene (arena + player) |
+| `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/` | 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`) |
 | `player.gd` | Movement, charge, turning logic |
 | `camera_spring_arm.gd` | Mouse-look pivot (`Node3D` + `SpringArm3D`) |
 | `camera_follow.gd` | Smooth camera follow (`Camera3D`) |
 | `matador.gd` | Matador AI (wander / ragdoll state machine) |
-| `matador_spawn.gd` | Spawns N matadors at random arena positions |
-| `debug_params.gd` | Runtime-tunable parameter registry (autoload `DP`) |
+| `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. 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 |
+| `BearAttackHitboxes.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`. `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`) |
+| `Sword.tscn` / `hitbox.gd` | The matador's sword wrapper (glb + editor-tweakable `BladeHitbox`). `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/run_state.gd` | Run progression autoload (`Run`) — Slay-the-Spire map + player position across fights |
+| `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) |
+| `levels/map_node.gd` | `MapNode` — one runtime node on the run map (position, level, links) |
+| `levels/MapScreen.tscn` / `levels/map_screen.gd` | Between-fights map screen; win → pick a node → next level |
+| `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 |
+| `crowd_billboards.gd` / `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 |
+| `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 `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; `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 |
+| `touch_controls.gd` | On-screen thumb UI for touch/web (`CanvasLayer`, instanced by `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 |
+| `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) |
+| `mobile_hud.gd` | Mobile-only health readouts (`CanvasLayer`, instanced by `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 |
+| `orientation_guard.gd` | Autoload `OrientationGuard` — full-screen "rotate your device" prompt shown on touch devices while portrait |
 | `Assets/` | Raw 3D assets (`.glb`, `.fbx`) |
 | `Blender/` | Blender source files, animation scripts, FBX exports |
 | `Blender/create_matador_anims.py` | Creates walk + idle animations and exports FBX |
@@ -88,10 +106,26 @@ After FBX import, animations appear as `Armature|walk` and `Armature|idle` in An
 bash run_tests.sh

 # Individual tests:
-gdlint *.gd tests/*.gd                                # GDScript lint (gdtoolkit, installed via uv)
+gdlint *.gd levels/*.gd tests/*.gd                                # 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
@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://bxm7c6ldrdiq5"
 path.bptc="res://.godot/imported/citrus_orchard_road_puresky_4k.hdr-262868e8787abf05f7044da72beefce7.bptc.ctex"
+path.astc="res://.godot/imported/citrus_orchard_road_puresky_4k.hdr-262868e8787abf05f7044da72beefce7.astc.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }

 [deps]

 source_file="res://HDRI/citrus_orchard_road_puresky_4k.hdr"
-dest_files=["res://.godot/imported/citrus_orchard_road_puresky_4k.hdr-262868e8787abf05f7044da72beefce7.bptc.ctex"]
+dest_files=["res://.godot/imported/citrus_orchard_road_puresky_4k.hdr-262868e8787abf05f7044da72beefce7.bptc.ctex", "res://.godot/imported/citrus_orchard_road_puresky_4k.hdr-262868e8787abf05f7044da72beefce7.astc.ctex"]

 [params]

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://3syhacswepyj"
 path.bptc="res://.godot/imported/kloppenheim_06_puresky_4k.hdr-026f0eabdfce50035e2f8417ce3e0060.bptc.ctex"
+path.astc="res://.godot/imported/kloppenheim_06_puresky_4k.hdr-026f0eabdfce50035e2f8417ce3e0060.astc.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }

 [deps]

 source_file="res://HDRI/kloppenheim_06_puresky_4k.hdr"
-dest_files=["res://.godot/imported/kloppenheim_06_puresky_4k.hdr-026f0eabdfce50035e2f8417ce3e0060.bptc.ctex"]
+dest_files=["res://.godot/imported/kloppenheim_06_puresky_4k.hdr-026f0eabdfce50035e2f8417ce3e0060.bptc.ctex", "res://.godot/imported/kloppenheim_06_puresky_4k.hdr-026f0eabdfce50035e2f8417ce3e0060.astc.ctex"]

 [params]

@@ -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, 1269629432) index="0" unique_id=978366810]
-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=256196413]
-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=988244930]
-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"]
@@ -2,7 +2,7 @@

 [ext_resource type="Script" uid="uid://46y10alai56q" path="res://main_menu.gd" id="1_menu"]
 [ext_resource type="VideoStream" uid="uid://csxxlnq74fej4" path="res://Assets/intro_bg.ogv" id="2_video"]
-[ext_resource type="Shader" path="res://menu_blur.gdshader" id="3_blur"]
+[ext_resource type="Shader" uid="uid://bmdtg6qlh7wri" path="res://menu_blur.gdshader" id="3_blur"]

 [sub_resource type="ShaderMaterial" id="mat_blur"]
 shader = ExtResource("3_blur")
@@ -74,7 +74,6 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 ratio = 1.7778
-stretch_mode = 2

 [node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="VideoAspect" unique_id=374854265]
 layout_mode = 2
@@ -281,7 +280,7 @@ bbcode_enabled = true
 text = "[center][font_size=32][color=#d9a833]Bullosseum[/color][/font_size]

 [b][color=#d9a833]Siim Raud[/color][/b]  [url=https://instagram.com/siimpressionist]@siimpressionist[/url]
-[font_size=20]Artist[/font_size]
+[font_size=20]Artist / Animator[/font_size]

 [b][color=#d9a833]Richard Aasa[/color][/b]  [url=https://instagram.com/aasarichard]@aasarichard[/url]
 [font_size=20]Programmer[/font_size]
@@ -1,6 +1,6 @@
-[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://matador.gd" id="1_matgd"]
 [ext_resource type="PackedScene" uid="uid://eu2lqjhowj4t" path="res://Assets/Matador.glb" id="2_matfbx"]

 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_body"]
@@ -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="."]
-monitoring = true
+[node name="HitArea" type="Area3D" parent="." unique_id=745037545]
 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")]
@@ -0,0 +1,5 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://b73nb47y8ppt"]
+
+[resource]
+albedo_color = Color(0.26098922, 0.27367952, 0.27059656, 1)
+metallic = 1.0
@@ -0,0 +1,14 @@
+shader_type spatial;
+
+void vertex() {
+	// Called for every vertex the material is visible on.
+}
+
+void fragment() {
+	// Called for every pixel the material is visible on.
+}
+
+//void light() {
+//	// Called for every pixel for every light affecting the material.
+//	// Uncomment to replace the default light processing function with this one.
+//}
@@ -0,0 +1 @@
+uid://bme1rkldtyrhu
@@ -0,0 +1,4 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://isrp2y47xs5x"]
+
+[resource]
+albedo_color = Color(0.49425018, 0.31969637, 0.21259204, 1)
@@ -0,0 +1,5 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://blpkmyikjnhbo"]
+
+[resource]
+emission_enabled = true
+emission = Color(0.4627451, 0.8117647, 0.9490196, 1)
@@ -0,0 +1,5 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://dgmk764033feq"]
+
+[resource]
+emission_enabled = true
+emission = Color(0.7096375, 0.3347874, 0.09943161, 1)
@@ -4,30 +4,18 @@
 [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
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kne1u"]
+radius = 0.7495117
+height = 1.845398

 [node name="Player" type="CharacterBody3D" unique_id=165510044]
-collision_layer = 3
+collision_layer = 2
+collision_mask = 9
 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="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")
@@ -35,4 +23,30 @@ 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, 1942410469) index="0" unique_id=550138996]
+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"]
@@ -0,0 +1,15 @@
+[gd_scene format=3 uid="uid://c8spearwrap01"]
+
+[ext_resource type="PackedScene" uid="uid://jepc74w8opbu" path="res://Assets/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")
@@ -0,0 +1,20 @@
+[gd_scene format=3 uid="uid://c8swordwrap01"]
+
+[ext_resource type="PackedScene" uid="uid://xyvank512l5n" path="res://Assets/sword.glb" id="1_swordglb"]
+[ext_resource type="Script" path="res://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")
@@ -8,5 +8,5 @@ script="rider-plugin.gd"

 [presets]

-active="off"
+active="on"
 presets="presets.json"
@@ -0,0 +1 @@
+uid://cn7fhjkro7637
@@ -1,9 +0,0 @@
-extends Camera3D
-
-
-@export var spring_arm: Node3D
-
-
-func _process(delta: float) -> void:
-	var lerp_power: float = DP.f("cam_lerp_power")
-	position = position.lerp(spring_arm.position, delta * lerp_power)
@@ -1 +0,0 @@
-uid://b720l6m0ehrj3
@@ -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
@@ -42,15 +48,30 @@ func _unhandled_input(event: InputEvent) -> void:
 		_user_fov = clamp(_user_fov * 1.1, fov_min, fov_max)


+# Pinch-to-zoom hook for the touch UI. `ratio` is the two-finger spread this frame over
+# last frame: >1 (fingers parting) narrows the FOV to zoom in, <1 widens it to pull back,
+# mirroring the scroll-wheel zoom_in/zoom_out feel.
+func adjust_zoom(ratio: float) -> void:
+	if ratio <= 0.0:
+		return
+	_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,
-		height,
-		cos(angle_rad) * horizontal_distance
+		sin(angle_rad) * horizontal_distance * _framing_scale,
+		height * _framing_scale,
+		cos(angle_rad) * horizontal_distance * _framing_scale
 	)

 	var target := get_parent() as Node3D
@@ -1,39 +0,0 @@
-extends Node3D
-
-@onready var spring_arm: SpringArm3D = $SpringArm3D
-var _desired_length: float = 7.0
-
-
-func _ready() -> void:
-	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
-	_desired_length = DP.f("cam_spring_length")
-	spring_arm.spring_length = _desired_length
-
-
-func _unhandled_input(event: InputEvent) -> void:
-	var sensitivity: float = DP.f("cam_sensitivity")
-	var min_vert: float = deg_to_rad(DP.f("cam_min_vert_angle"))
-	var max_vert: float = deg_to_rad(DP.f("cam_max_vert_angle"))
-	var min_zoom: float = DP.f("cam_min_zoom")
-	var max_zoom: float = DP.f("cam_max_zoom")
-
-	if event is InputEventMouseMotion:
-		rotation.y -= event.relative.x * sensitivity
-		rotation.y = wrapf(rotation.y, 0.0, TAU)
-		rotation.x -= event.relative.y * sensitivity
-		rotation.x = clamp(rotation.x, min_vert, max_vert)
-
-	if event.is_action_pressed("zoom_in"):
-		_desired_length = clamp(_desired_length / 1.2, min_zoom, max_zoom)
-	if event.is_action_pressed("zoom_out"):
-		_desired_length = clamp(_desired_length * 1.2, min_zoom, max_zoom)
-
-	if event.is_action_pressed("toggle_mouse_capture"):
-		if Input.mouse_mode == Input.MOUSE_MODE_CAPTURED:
-			Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
-		else:
-			Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
-
-
-func _process(_delta: float) -> void:
-	spring_arm.spring_length = _desired_length
@@ -1 +0,0 @@
-uid://b4td4k8yo5y78
@@ -18,6 +18,8 @@ const _COMMANDS := {
 	"diff":   "list params changed from default",
 	"toggle": "flip a bool param",
 	"list":   "print params (optional section)",
+	"level":   "select level and reload (level <id> — arena / arena_boss / bear)",
+	"restart": "reload the current level scene",
 	"clear":  "clear the log",
 	"help":   "show this help",
 }
@@ -472,6 +474,12 @@ func _run_command(parts: PackedStringArray) -> bool:
 			_cmd_diff()
 		"list":
 			_cmd_list(parts)
+		"level":
+			_cmd_level(parts)
+		"restart":
+			_log_ok("Restarting…")
+			get_tree().paused = false
+			get_tree().reload_current_scene()
 		"clear":
 			_log.clear()
 		"help":
@@ -581,9 +589,9 @@ func _set_param(key: String, meta: Dictionary, raw: String) -> void:
 		var lo := meta["min"] as float
 		var hi := meta["max"] as float
 		if not raw.is_valid_float() or not is_finite(raw.to_float()):
-			_log_warn("%s wants a number %s … %s" % [key, _fmt_num(lo), _fmt_num(hi)])
+			_log_warn("%s wants a number" % key)
 			return
-		var v := snappedf(clampf(raw.to_float(), lo, hi), meta["step"] as float)
+		var v := raw.to_float()
 		DP.set_value(key, v)
 		_log_ok("[b]%s[/b] ← [color=#ffe080]%s[/color]" % [key, _fmt_num(v)])
 	elif meta["type"] == TYPE_BOOL:
@@ -600,6 +608,26 @@ func _set_param(key: String, meta: Dictionary, raw: String) -> void:
 		_log_warn("Cannot set param of type %d" % meta["type"])


+func _cmd_level(parts: PackedStringArray) -> void:
+	if parts.size() == 1:
+		var cur := Run.active_level()
+		var cur_name := (cur.id as String) if cur != null else "none"
+		_log_ok("Current level: [b]%s[/b]" % cur_name)
+		var ids: Array[StringName] = Run.level_ids()
+		_log_raw("Available: " + "  ".join(ids.map(func(id: StringName) -> String: return str(id))))
+		return
+	var id := StringName(parts[1].to_lower())
+	var level := Run.get_level(id)
+	if level == null:
+		var known := "  ".join(Run.level_ids().map(func(i: StringName) -> String: return str(i)))
+		_log_warn("Unknown level '%s'. Try: %s" % [parts[1], known])
+		return
+	Run.debug_level_override = level
+	_log_ok("Level set to [b]%s[/b] — reloading…" % str(id))
+	get_tree().paused = false
+	get_tree().change_scene_to_file(level.scene_path)
+
+
 func _cmd_list(parts: PackedStringArray) -> void:
 	var filter := parts[1].to_lower() if parts.size() > 1 else ""
 	var all    := DP.get_all()
@@ -23,21 +23,203 @@ const REBINDABLE_ACTIONS: PackedStringArray = [

 func _ready() -> void:
 	load_saved()
+	_install_web_fullscreen_hook()
+
+
+# ── Web fullscreen + landscape lock ─────────────────────────────────────────────
+# The reliable way to force fullscreen on the web: install a NATIVE DOM listener that calls
+# requestFullscreen() synchronously inside the real user-gesture event — the same thing
+# three.js games do. Godot dispatches input from its rAF render loop, one hop removed from the
+# DOM event, so both Godot's window_set_mode and a JS call made from _input() run outside the
+# gesture's activation and some mobile browsers reject them. The listener below sidesteps that
+# entirely, and — left attached — re-enters fullscreen on the next tap if the player leaves it.
+# All of it is guarded, so iPhone Safari (no requestFullscreen) and desktop just no-op cleanly.
+func _install_web_fullscreen_hook() -> void:
+	if not OS.has_feature("web"):
+		return
+	JavaScriptBridge.eval("""
+(function(){
+	if (window.__bullFSInit) return;
+	window.__bullFSInit = true;
+	window.__bull_fs = 'idle';
+	// Armed = we should grab fullscreen on the next tap. Starts true so the first tap enters,
+	// then disarms — so once the player is in (or deliberately leaves via Esc / back / swipe)
+	// ordinary gameplay taps never yank them back in. WebStartGate re-arms via arm_fullscreen().
+	window.__bullFSArmed = true;
+	window.__bullFS = function(){
+		try {
+			if (document.fullscreenElement || document.webkitFullscreenElement) {
+				window.__bull_fs = 'ok'; window.__bullFSArmed = false; return;
+			}
+			if (!window.__bullFSArmed) return;
+			var c = document.getElementById('canvas') || document.querySelector('canvas')
+				|| document.documentElement;
+			var rf = c.requestFullscreen || c.webkitRequestFullscreen
+				|| c.msRequestFullscreen || c.mozRequestFullScreen;
+			if (!rf) { window.__bull_fs = 'no-api'; lock(); return; }
+			window.__bull_fs = 'req';
+			var p = rf.call(c);
+			if (p && p.then) {
+				p.then(function(){ window.__bull_fs = 'ok'; window.__bullFSArmed = false; lock(); },
+					function(e){ window.__bull_fs = 'err:' + (e && e.name || e); });
+			} else { window.__bull_fs = 'ok'; window.__bullFSArmed = false; lock(); }
+		} catch(e){ window.__bull_fs = 'ex:' + (e && e.name || e); }
+		function lock(){ try { if (screen.orientation && screen.orientation.lock)
+			screen.orientation.lock('landscape').catch(function(){}); } catch(e){} }
+	};
+	// pointerup / touchend / click grant transient activation (pointerdown/touchstart do not).
+	['pointerup','touchend','click'].forEach(function(ev){
+		window.addEventListener(ev, function(){ window.__bullFS(); }, true);
+	});
+})();
+""", true)
+
+
+## Ask to enter fullscreen + landscape now (e.g. from WebStartGate's tap). The DOM listener
+## installed above normally beats this to it on the same gesture; this is the explicit path and
+## is a safe no-op if we're already fullscreen. No-op off web.
+func request_fullscreen_landscape() -> void:
+	if not OS.has_feature("web"):
+		return
+	_install_web_fullscreen_hook()
+	JavaScriptBridge.eval("if (window.__bullFS) window.__bullFS();", true)
+
+
+## Re-arm the "grab fullscreen on next tap" hook, so the next tap re-enters. WebStartGate calls
+## this whenever it shows itself (boot, or after the player left fullscreen). No-op off web.
+func arm_fullscreen() -> void:
+	if OS.has_feature("web"):
+		JavaScriptBridge.eval("window.__bullFSArmed = true;", true)
+
+
+## Whether the browser can go fullscreen at all. False on iPhone Safari (no requestFullscreen),
+## which lets WebStartGate stop prompting there instead of nagging forever. True off web (n/a).
+func fullscreen_supported() -> bool:
+	if not OS.has_feature("web"):
+		return true
+	var r: Variant = JavaScriptBridge.eval(
+		"(function(){var c=document.getElementById('canvas')||document.documentElement;"
+		+ "return !!(c.requestFullscreen||c.webkitRequestFullscreen"
+		+ "||c.msRequestFullscreen||c.mozRequestFullScreen)?1:0;})()", true)
+	if r is bool:
+		return r
+	if r is int or r is float:
+		return int(r) != 0
+	return false
+
+
+## Is the browser currently fullscreen? No-op-ish off web (returns false).
+func is_browser_fullscreen() -> bool:
+	if not OS.has_feature("web"):
+		return false
+	var r: Variant = JavaScriptBridge.eval(
+		"(document.fullscreenElement||document.webkitFullscreenElement)?1:0", true)
+	if r is bool:
+		return r
+	if r is int or r is float:
+		return int(r) != 0
+	return false
+
+
+## One-line web diagnostic for the on-device debug overlay: secure context, cross-origin
+## isolation (threads), last fullscreen attempt result, and whether we're fullscreen now.
+func fullscreen_status() -> String:
+	if not OS.has_feature("web"):
+		return "native"
+	var r: Variant = JavaScriptBridge.eval(
+		"'sec=' + (window.isSecureContext ? 1 : 0) + ' iso=' + (window.crossOriginIsolated ? 1 : 0)"
+		+ " + ' fs=' + (window.__bull_fs || '?')"
+		+ " + ' cur=' + ((document.fullscreenElement || document.webkitFullscreenElement) ? 1 : 0)",
+		true)
+	return str(r) if r != null else "?"


 ## Whether to drive the game with the on-screen touch UI (joystick + buttons)
-## instead of keyboard hints. DisplayServer.is_touchscreen_available() can't be
-## used here: `emulate_touch_from_mouse` (on for desktop testing) makes it report
-## true on every desktop. Gate on the actual runtime platform instead — real
-## mobile/native and mobile web browsers — plus the DP force flag for testing.
+## instead of keyboard hints. Platform detection is cached (it can't change mid-run)
+## so the per-frame/per-input callers don't repay the cost — but the DP force flag is
+## re-read every call so the console can toggle the layout live on a desktop build.
+var _touch_ui_cached: int = -1   # -1 = not yet detected, 0 = false, 1 = true
+
+
 func use_touch_ui() -> bool:
 	if DP.b("force_touch_controls"):
 		return true
-	return (
+	if _touch_ui_cached == -1:
+		_touch_ui_cached = 1 if _detect_touch_ui() else 0
+	return _touch_ui_cached == 1
+
+
+## True only on touch-primary devices (phones, tablets). Detection is deliberately
+## conservative so a desktop never gets the on-screen thumb UI.
+##
+## DisplayServer.is_touchscreen_available() is unusable here on two fronts: on native
+## desktop `emulate_touch_from_mouse` (on for testing) forces it true, and on the web build
+## it maps to `'ontouchstart' in window`, which desktop Chromium reports true even with no
+## touchscreen. So on web we ask the browser two questions instead: does it report touch
+## points, AND is the *primary* pointer coarse? A desktop-with-mouse (even a touch laptop)
+## answers no to the second and keeps the desktop HUD; a phone/tablet answers yes to both.
+## maxTouchPoints also catches iPadOS, which masquerades as desktop Safari.
+func _detect_touch_ui() -> bool:
+	if (
 		OS.has_feature("mobile")
 		or OS.has_feature("web_android")
 		or OS.has_feature("web_ios")
-	)
+	):
+		return true
+	if not OS.has_feature("web"):
+		return false
+	var js := "(navigator.maxTouchPoints > 0) && window.matchMedia('(pointer: coarse)').matches"
+	var touch_primary: Variant = JavaScriptBridge.eval(js, true)
+	if touch_primary is bool:
+		return touch_primary
+	if touch_primary is int or touch_primary is float:
+		return int(touch_primary) != 0
+	return false
+
+
+## Whether on-screen debug overlays (touch state + render diagnostics) should show. True on
+## the DP "touch_debug" flag, or — so it can be switched on from a phone where no console is
+## reachable — when the page URL carries a `debug` query param (append `?debug=1`).
+var _url_debug: int = -1
+
+
+func debug_overlay() -> bool:
+	if DP.b("touch_debug"):
+		return true
+	if _url_debug == -1:
+		_url_debug = 0
+		if OS.has_feature("web"):
+			var has: Variant = JavaScriptBridge.eval(
+				"String(window.location.search).indexOf('debug') >= 0", true)
+			if (has is bool and has) or ((has is int or has is float) and int(has) != 0):
+				_url_debug = 1
+	return _url_debug == 1
+
+
+## Whether to apply the rigid-skin workaround (rigid_skin.gd) instead of native GPU skinning.
+## Defaults to the DP "use_rigid_skin" flag (on for web), but a page URL param overrides it so
+## native skinning can be A/B'd on the actual phone with no console reachable: append `?noskin=1`
+## to force it OFF (does the device render skinned meshes natively now — e.g. after a Godot web
+## template update? — and do the bear's rigid-skin seam holes go away), or `?skin=1` to force ON.
+## -1 = not read yet, 0 = url forces off, 1 = url forces on, 2 = no url override (use DP flag).
+var _url_skin: int = -1
+
+
+func rigid_skin_enabled() -> bool:
+	if _url_skin == -1:
+		_url_skin = 2
+		if OS.has_feature("web"):
+			var q: Variant = JavaScriptBridge.eval("String(window.location.search)", true)
+			var s: String = str(q) if q != null else ""
+			if s.find("noskin") >= 0:
+				_url_skin = 0
+			elif s.find("skin") >= 0:
+				_url_skin = 1
+	if _url_skin == 0:
+		return false
+	if _url_skin == 1:
+		return true
+	return DP.b("use_rigid_skin")


 ## Returns the first keyboard event bound to an action, or null.
@@ -1,19 +1,16 @@
 extends MultiMeshInstance3D
-## A whole stand of cheering spectators rendered as camera-facing billboards in a
-## single draw call — the performant replacement for dozens of skinned crowd skeletons.
-## The sprite sheet is baked from the existing crowd figure by tools/bake_crowd_sheet.gd.
+## A whole stand of cheering spectators rendered as flat billboards in a single draw
+## call — the performant replacement for dozens of skinned crowd skeletons. The sprite
+## sheet is baked from the existing crowd figure by tools/bake_crowd_sheet.gd.
 ##
-## Placement mirrors an existing crowd node (default: the sibling PublikNode) so the
-## billboards land exactly where the crowd was authored; if that node is missing it
-## falls back to a generated tribune so the scene still populates.
+## Placement comes from CrowdMarker nodes the designer drops into the level (collected
+## via the &"crowd_marker" group): each marker gives one spectator its world position and
+## a chosen facing (one of six 60°-spaced headings). If no markers are present the scene
+## falls back to a generated tribune so it still populates.

 const SHEET_PATH  := "res://Assets/crowd_clap_sheet.png"
 const SHADER_PATH := "res://crowd_billboard.gdshader"

-## Node whose descendant figures (names starting with `figure_prefix`) donate their
-## world positions. Empty = use the generated fallback stand.
-@export var source_path: NodePath = ^"../PublikNode"
-@export var figure_prefix: String = "mees"
 ## World height of a spectator billboard, in metres. Sheet aspect sets the width.
@export var figure_height: float = 2.0
@export var frames: int = 8
@@ -36,7 +33,8 @@ var _rng := RandomNumberGenerator.new()

 func _ready() -> void:
 	_rng.seed = hash("bullosseum-crowd")   # deterministic layout/phases across runs
-	_build()
+	# Deferred so every CrowdMarker has run _ready and joined the group before we harvest.
+	_build.call_deferred()


 func _build() -> void:
@@ -58,71 +56,53 @@ func _build() -> void:
 	mat.set_shader_parameter("fps", clap_fps)
 	material_override = mat

-	var seats := _seat_positions()
-	var center := _arena_center(seats)
+	# Each seat is a (global feet-position, unit forward) pair.
+	var positions := PackedVector3Array()
+	var facings: Array[Vector3] = []
+	_collect_seats(positions, facings)

 	var mm := MultiMesh.new()
 	mm.transform_format = MultiMesh.TRANSFORM_3D
 	mm.use_custom_data = true
 	mm.mesh = quad
-	mm.instance_count = seats.size()
+	mm.instance_count = positions.size()

-	for i in seats.size():
+	for i in positions.size():
 		var s := 1.0 + _rng.randf_range(-0.06, 0.06)          # slight height variety
-		mm.set_instance_transform(i, Transform3D(_facing_basis(seats[i], center, s), seats[i]))
+		mm.set_instance_transform(i, Transform3D(_upright_basis(facings[i], s), positions[i]))
 		var b := 1.0 + _rng.randf_range(-tint_variation, tint_variation)
 		mm.set_instance_custom_data(i, Color(_rng.randf(), b, b * 0.99, b * 0.98))
 	multimesh = mm


-# Orientation for a seat: the sprite's forward (+Z, the quad's face) points horizontally
-# inward at the arena centre, so each ring segment faces the action instead of the
-# camera. Upright (world +Y), uniformly scaled by `s`.
-func _facing_basis(seat: Vector3, center: Vector3, s: float) -> Basis:
-	var look := center - seat
+# Upright basis whose forward (+Z, the quad's face) points along `look`, uniformly
+# scaled by `s`. World +Y stays up so spectators never tilt.
+func _upright_basis(look: Vector3, s: float) -> Basis:
 	look.y = 0.0
-	look = look.normalized() if look.length() > 0.001 else Vector3(0.0, 0.0, -1.0)
+	look = look.normalized() if look.length() > 0.001 else Vector3(0.0, 0.0, 1.0)
 	var up := Vector3.UP
-	var right := up.cross(look).normalized()
 	var basis := Basis()
-	basis.x = right
+	basis.x = up.cross(look).normalized()
 	basis.y = up
 	basis.z = look
 	return basis.scaled(Vector3.ONE * s)


-# Horizontal centre the crowd faces — the mean of the seat positions (the ring/stand
-# centroid), which for an arena crowd is the middle of the pitch.
-func _arena_center(seats: PackedVector3Array) -> Vector3:
-	if seats.is_empty():
-		return global_position
-	var sum := Vector3.ZERO
-	for p in seats:
-		sum += p
-	return sum / float(seats.size())
+# Seats from designer-placed CrowdMarker nodes: each contributes its world position and
+# its chosen 60°-spaced facing. With no markers present, fall back to a generated ring
+# that faces inward so the scene still shows a crowd.
+func _collect_seats(positions: PackedVector3Array, facings: Array[Vector3]) -> void:
+	for node in get_tree().get_nodes_in_group(&"crowd_marker"):
+		var marker := node as Node3D
+		if marker == null or not marker.has_method(&"facing_dir"):
+			continue
+		positions.append(marker.global_position)
+		facings.append(marker.facing_dir())
+	if positions.is_empty():
+		_fallback_stand(positions, facings)


-# Global feet-positions for every spectator: harvested from the source crowd if present,
-# otherwise the generated fallback tribune.
-func _seat_positions() -> PackedVector3Array:
-	var out := PackedVector3Array()
-	var src := get_node_or_null(source_path)
-	if src != null:
-		_collect_figures(src, out)
-	if out.is_empty():
-		_fallback_stand(out)
-	return out
-
-
-func _collect_figures(node: Node, out: PackedVector3Array) -> void:
-	if node is Node3D and node != self and (node as Node3D).name.begins_with(figure_prefix):
-		out.append((node as Node3D).global_position)
-		return   # don't descend into a figure's own rig
-	for c in node.get_children():
-		_collect_figures(c, out)
-
-
-func _fallback_stand(out: PackedVector3Array) -> void:
+func _fallback_stand(positions: PackedVector3Array, facings: Array[Vector3]) -> void:
 	var placed := 0
 	for row in fallback_rows:
 		var radius := fallback_inner_radius + float(row) * fallback_row_step
@@ -133,5 +113,7 @@ func _fallback_stand(out: PackedVector3Array) -> void:
 			if placed >= fallback_count:
 				return
 			var ang := TAU * float(s) / float(seats_in_row)
-			out.append(Vector3(cos(ang) * radius, y, sin(ang) * radius))
+			var pos := Vector3(cos(ang) * radius, y, sin(ang) * radius)
+			positions.append(pos)
+			facings.append(-pos)   # face the ring centre (origin)
 			placed += 1
@@ -0,0 +1,89 @@
+@tool
+extends Node3D
+class_name CrowdMarker
+## A designer-placed spot for one billboard spectator. Drop these into a level in the
+## editor; crowd_billboards.gd harvests every marker (via the &"crowd_marker" group) into
+## its MultiMesh at runtime, using each marker's global position and chosen facing.
+##
+## The marker draws a lightweight preview (a slab standing in for the sprite + a forward
+## arrow) so its position and orientation are visible in the viewport. That preview is
+## editor-only and never serialised into the scene, so it costs nothing at runtime.
+
+## The six selectable facings, one every 60° about the Y axis. DEG_0 faces the quad's
+## front (+Z) along world +Z; increasing values rotate clockwise looking down.
+enum Orientation {
+	DEG_0,
+	DEG_60,
+	DEG_120,
+	DEG_180,
+	DEG_240,
+	DEG_300,
+}
+
+const ORIENTATION_STEPS := 6
+## Metres — matches crowd_billboards.figure_height so the editor preview reads true to scale.
+const PREVIEW_HEIGHT := 2.0
+
+@export var orientation := Orientation.DEG_0:
+	set(value):
+		orientation = value
+		_apply_orientation()
+
+var _preview: Node3D
+
+
+func _ready() -> void:
+	add_to_group(&"crowd_marker")
+	if Engine.is_editor_hint():
+		_build_preview()
+		_apply_orientation()
+
+
+# Facing about Y for the current orientation: 0, 60, 120 … degrees as radians.
+func facing_yaw() -> float:
+	return float(orientation) * (TAU / float(ORIENTATION_STEPS))
+
+
+# Unit forward the spectator's front (+Z) points along, on the horizontal plane.
+func facing_dir() -> Vector3:
+	var a := facing_yaw()
+	return Vector3(sin(a), 0.0, cos(a))
+
+
+func _apply_orientation() -> void:
+	if _preview != null:
+		_preview.rotation = Vector3(0.0, facing_yaw(), 0.0)
+
+
+# Editor-only preview. Children are added without an owner so they are excluded from the
+# saved .tscn (Godot only serialises nodes owned by the scene root).
+func _build_preview() -> void:
+	_preview = Node3D.new()
+	add_child(_preview)
+
+	var aspect := 0.5
+	var slab := MeshInstance3D.new()
+	var quad := QuadMesh.new()
+	quad.size = Vector2(PREVIEW_HEIGHT * aspect, PREVIEW_HEIGHT)
+	quad.center_offset = Vector3(0.0, PREVIEW_HEIGHT * 0.5, 0.0)   # stand on the marker
+	slab.mesh = quad
+	slab.material_override = _preview_material(Color(0.3, 0.7, 1.0, 0.35))
+	_preview.add_child(slab)
+
+	var arrow := MeshInstance3D.new()
+	var shaft := BoxMesh.new()
+	shaft.size = Vector3(0.08, 0.08, PREVIEW_HEIGHT * 0.5)
+	arrow.mesh = shaft
+	# Push the shaft out along +Z (the facing) and up to chest height.
+	arrow.position = Vector3(0.0, PREVIEW_HEIGHT * 0.5, PREVIEW_HEIGHT * 0.25)
+	arrow.material_override = _preview_material(Color(1.0, 0.85, 0.2, 0.9))
+	_preview.add_child(arrow)
+
+
+func _preview_material(col: Color) -> StandardMaterial3D:
+	var mat := StandardMaterial3D.new()
+	mat.albedo_color = col
+	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+	mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
+	mat.cull_mode = BaseMaterial3D.CULL_DISABLED
+	return mat
@@ -0,0 +1 @@
+uid://70j3ks1emhkd
@@ -0,0 +1,80 @@
+class_name DamageEvent
+extends RefCounted
+## The one typed payload for every hit in the game — a bull goring a matador, a bear slam popping
+## the bull, a thrown spear landing. It replaces the scattered, stringly Object.call(&"take_sword_hit",
+## "gored") paths: an emitter (a Hitbox) fills one of these and hands it to the target's
+## receive_damage(event). One shape to read, log and type-check, instead of four call conventions.
+##
+## It serves both victim models the game already has: the bull, which dies on one clean hit
+## (lethal + cause + hit_position), and an enemy, which is launched/ragdolled by an impulse
+## (knockback_dir · knockback_strength + knock_up). A given hit just leaves the fields it doesn't
+## use at their defaults.
+
+enum Cause { GENERIC, GORED, MAULED, THROWN, SLAMMED, KICKED, DASHED }
+
+## Who dealt the hit — for attribution and for ignoring self-overlap. May be null.
+var source: Node = null
+## What kind of hit; drives the victim's reaction (blood/vignette/FX) and any future resistances.
+var cause: Cause = Cause.GENERIC
+## World contact point, so impact FX spawn where the hit actually landed.
+var hit_position: Vector3 = Vector3.ZERO
+## Planar push direction (need not be normalised). Vector3.ZERO = no horizontal knockback.
+var knockback_dir: Vector3 = Vector3.ZERO
+## Impulse magnitude behind knockback_dir — the enemy launch/ragdoll strength.
+var knockback_strength: float = 0.0
+## Upward launch in m/s (an overhead smash pop, a leap-slam outer ring). 0 = a grounded hit.
+var knock_up: float = 0.0
+## One clean hit ends the run for the bull; most enemy-dealt hits are lethal to it. Enemies that
+## are merely launched (not killed) by the bull's abilities set this false.
+var lethal: bool = true
+
+
+static func make(kind: Cause, at: Vector3, src: Node = null) -> DamageEvent:
+	var e := DamageEvent.new()
+	e.cause = kind
+	e.hit_position = at
+	e.source = src
+	return e
+
+
+## The single entry point every attacker uses to wound a target: build the typed event and hand it
+## to receive_damage(). Falls back to the legacy string call for any target not yet migrated, so a
+## caller never has to branch on which contract the victim speaks. `knock_up_v` is the already-shaped
+## pop (0 = grounded); callers that scale it by distance compute it before calling.
+static func deal(target: Node, kind: Cause, at: Vector3, src: Node = null, knock_up_v: float = 0.0) -> void:
+	if target == null:
+		return
+	if target.has_method(&"receive_damage"):
+		var event := make(kind, at, src)
+		event.knock_up = knock_up_v
+		target.call(&"receive_damage", event)
+		return
+	if target.has_method(&"take_sword_hit"):
+		target.call(&"take_sword_hit", make(kind, at, src).cause_name(), at)
+		if knock_up_v > 0.0 and target.has_method(&"apply_knock_up"):
+			target.call(&"apply_knock_up", knock_up_v)
+
+
+## Lower-case name of the cause, for logs and for the bull's existing cause-keyed reactions
+## ("gored" / "mauled" / "thrown") during the migration off string causes.
+func cause_name() -> String:
+	return String(Cause.keys()[cause]).to_lower()
+
+
+## Maps a legacy cause string onto the enum, so a Hitbox's exported damage_cause round-trips
+## exactly (gored/mauled/thrown are the only ones in use). Unknown strings fall back to GENERIC.
+static func cause_from(text: String) -> Cause:
+	match text.to_lower():
+		"gored":
+			return Cause.GORED
+		"mauled":
+			return Cause.MAULED
+		"thrown":
+			return Cause.THROWN
+		"slammed":
+			return Cause.SLAMMED
+		"kicked":
+			return Cause.KICKED
+		"dashed":
+			return Cause.DASHED
+	return Cause.GENERIC
@@ -9,7 +9,11 @@ extends Node
 ##     bodies get picked up within one interval.
 ##
 ## Toggle from the console:
-##   show_collisions · show_hitboxes · show_bones · show_raycasts   (true / false)
+##   show_hitboxes · show_attacks · show_bones · show_raycasts   (true / false)
+##     show_hitboxes — the combatants' hurt volumes: each HitArea + the player/enemy body
+##       capsules, drawn as calm translucent-blue volumes (what abilities/blades hit)
+##     show_attacks  — the attack hitboxes (bear claw/smash/leap, matador blade, thrown
+##       spear), filled translucent red and shown ONLY while the swing is actually live
 ##   show_states          — floating AI-state tags + velocity vectors over each matador
 ##   show_animation_name  — floating current-clip tag over every AnimationPlayer host
 ##   show_stats           — 2D corner readout: fps / frame ms / draw calls / matador tally
@@ -20,13 +24,14 @@ extends Node
 const REBUILD_INTERVAL := 0.5
 const STATS_INTERVAL   := 0.2   # stats text is re-composed 5×/sec, not every frame

-const COLOR_BODY := Color(0.30, 1.0, 0.45)   # collision wireframes (green)
-const COLOR_AREA := Color(0.0, 0.9, 1.0)     # hit-area volumes (cyan, translucent)
+const COLOR_AREA   := Color(0.0, 0.9, 1.0)     # combatant hurt volumes (cyan, translucent)
+const COLOR_ATTACK := Color(1.0, 0.30, 0.15)   # attack hitboxes (red, translucent, overlaid)
 const COLOR_BONE := Color(1.0, 0.35, 0.9)    # skeleton bones (magenta)
 const COLOR_VEL  := Color(1.0, 0.85, 0.2)    # matador velocity vectors (amber)
 const COLOR_ANIM := Color(0.55, 0.85, 1.0)   # animation-name tags (sky blue)
 const COLOR_GRID := Color(0.45, 0.45, 0.45, 0.5)
-const AREA_ALPHA := 0.25
+const AREA_ALPHA   := 0.25
+const ATTACK_ALPHA := 0.32

 const GRID_HALF := 20      # grid extends ±GRID_HALF cells from the origin
 const GRID_STEP := 1.0     # metres between grid lines
@@ -80,6 +85,7 @@ func ray(from: Vector3, to: Vector3, color: Color = Color.YELLOW) -> void:

 func _process(delta: float) -> void:
 	_reconcile(delta)
+	_pulse_attacks()
 	if DP.b("show_bones"):
 		_draw_bones()
 	if DP.b("show_states"):
@@ -359,11 +365,11 @@ func _si(n: int) -> String:
 # ── Collision / hit-area overlays (incremental) ────────────────────────────────

 func _reconcile(delta: float) -> void:
-	var col  := DP.b("show_collisions")
 	var hit  := DP.b("show_hitboxes")
+	var atk  := DP.b("show_attacks")
 	var bone := DP.b("show_bones")
 	var anim := DP.b("show_animation_name")
-	if not (col or hit or bone or anim):
+	if not (hit or atk or bone or anim):
 		if not _overlays.is_empty():
 			_clear_overlays()
 		_skeletons.clear()
@@ -371,7 +377,7 @@ func _reconcile(delta: float) -> void:
 		_prev_flags = ""
 		return

-	var flags := "%d%d%d%d" % [int(col), int(hit), int(bone), int(anim)]
+	var flags := "%d%d%d%d" % [int(hit), int(atk), int(bone), int(anim)]
 	_reconcile_t -= delta
 	if flags != _prev_flags:      # a toggle just changed — refresh immediately
 		_prev_flags  = flags
@@ -385,7 +391,7 @@ func _reconcile(delta: float) -> void:
 	var wanted: Dictionary = {}
 	var scene := get_tree().current_scene
 	if scene != null:
-		_collect(scene, col, hit, bone, anim, wanted)
+		_collect(scene, hit, atk, bone, anim, wanted)

 	# Drop overlays whose shape is gone or no longer wanted. The overlay is a child of
 	# the collision shape, so it's freed with it — hold it as Variant, since assigning a
@@ -401,10 +407,11 @@ func _reconcile(delta: float) -> void:
 	for id: int in wanted:
 		if not _overlays.has(id):
 			var entry: Array = wanted[id]
-			_overlays[id] = _attach(entry[0] as CollisionShape3D, entry[1] as bool)
+			_overlays[id] = _attach(entry[0] as CollisionShape3D, entry[1] as String)


-func _collect(node: Node, col: bool, hit: bool, bone: bool, anim: bool, wanted: Dictionary) -> void:
+func _collect(node: Node, hit: bool, atk: bool, bone: bool, anim: bool,
+		wanted: Dictionary) -> void:
 	# The audience ("public") is ambient decoration, not a debug target — skip the whole
 	# crowd subtree so its clapping AnimationPlayers/skeletons don't flood the overlays.
 	if node.is_in_group(&"public"):
@@ -416,15 +423,28 @@ func _collect(node: Node, col: bool, hit: bool, bone: bool, anim: bool, wanted:
 	if node is CollisionShape3D:
 		var cs := node as CollisionShape3D
 		if cs.shape != null and not cs.disabled and _drawable(cs.shape):
-			var parent := cs.get_parent()
-			var is_area := parent is Area3D
-			# Ragdoll bone colliders (PhysicalBone3D) are excluded — use show_bones for
-			# the skeleton; otherwise every corpse floods the view with capsules.
-			var is_body := parent is PhysicsBody3D and not (parent is PhysicalBone3D)
-			if (is_area and hit) or (is_body and col):
-				wanted[cs.get_instance_id()] = [cs, is_area]
+			var kind := _classify(cs.get_parent())
+			var show := (kind == "attack" and atk) or (kind == "hitbox" and hit)
+			if show:
+				wanted[cs.get_instance_id()] = [cs, kind]
 	for child in node.get_children():
-		_collect(child, col, hit, bone, anim, wanted)
+		_collect(child, hit, atk, bone, anim, wanted)
+
+
+# Sort a shape's owning body/area into an overlay bucket, or "" to skip.
+#   attack — a swing volume (a Hitbox area, or a thrown-spear projectile body)
+#   hitbox — a combatant's hurt volume: its HitArea, or its own body capsule
+func _classify(parent: Node) -> String:
+	if parent is Hitbox or parent is SpearProjectile:
+		return "attack"
+	if parent is Area3D:
+		return "hitbox"
+	# Ragdoll bone colliders (PhysicalBone3D) are excluded — use show_bones for the
+	# skeleton; otherwise every corpse floods the view with capsules.
+	if parent is PhysicsBody3D and not (parent is PhysicalBone3D):
+		if parent.is_in_group(&"player") or parent.is_in_group(&"matador"):
+			return "hitbox"
+	return ""


 # Skip only the unbounded shapes whose debug mesh is meaningless/huge; concave arena
@@ -433,20 +453,35 @@ func _drawable(shape: Shape3D) -> bool:
 	return not (shape is WorldBoundaryShape3D or shape is HeightMapShape3D)


-func _attach(cs: CollisionShape3D, is_area: bool) -> MeshInstance3D:
+func _attach(cs: CollisionShape3D, kind: String) -> MeshInstance3D:
 	var mi := MeshInstance3D.new()
-	if is_area:
-		var solid := _solid_mesh(cs.shape)
-		mi.mesh              = solid if solid != null else cs.shape.get_debug_mesh()
-		mi.material_override = _translucent_material(COLOR_AREA)
+	var solid := _solid_mesh(cs.shape)
+	mi.mesh = solid if solid != null else cs.shape.get_debug_mesh()
+	if kind == "attack":
+		# Overlaid so a brief swing volume reads clearly on top of the action; its
+		# visibility is pulsed per-frame in _pulse_attacks so it only shows while live.
+		mi.material_override = _translucent_material(COLOR_ATTACK, ATTACK_ALPHA, true)
 	else:
-		mi.mesh              = cs.shape.get_debug_mesh()
-		mi.material_override = _wire_material(COLOR_BODY)
+		# The calm translucent-blue volume — depth-tested so it sits in the world.
+		mi.material_override = _translucent_material(COLOR_AREA, AREA_ALPHA, false)
 	mi.cast_shadow = GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
 	cs.add_child(mi)
 	return mi


+# Attack overlays exist for as long as show_attacks is on, but a swing hitbox is only a
+# hazard while its Hitbox is monitoring — so show each attack volume only when it's live.
+# (A thrown spear has no monitoring gate; it stays visible for its whole flight.)
+func _pulse_attacks() -> void:
+	for id: int in _overlays:
+		var mi: Variant = _overlays[id]
+		if not is_instance_valid(mi):
+			continue
+		var owner := (mi as Node).get_parent().get_parent()
+		if owner is Hitbox:
+			(mi as MeshInstance3D).visible = (owner as Area3D).monitoring
+
+
 func _clear_overlays() -> void:
 	for id: int in _overlays:
 		var mi: Variant = _overlays[id]
@@ -491,19 +526,12 @@ func _line_material() -> StandardMaterial3D:
 	return mat


-func _wire_material(color: Color) -> StandardMaterial3D:
-	var mat := StandardMaterial3D.new()
-	mat.shading_mode  = BaseMaterial3D.SHADING_MODE_UNSHADED
-	mat.albedo_color  = color
-	mat.no_depth_test = true
-	return mat
-
-
-func _translucent_material(color: Color) -> StandardMaterial3D:
+func _translucent_material(color: Color, alpha: float, overlay: bool) -> StandardMaterial3D:
 	var mat := StandardMaterial3D.new()
 	mat.shading_mode    = BaseMaterial3D.SHADING_MODE_UNSHADED
 	mat.transparency    = BaseMaterial3D.TRANSPARENCY_ALPHA
-	mat.albedo_color    = Color(color.r, color.g, color.b, AREA_ALPHA)
+	mat.albedo_color    = Color(color.r, color.g, color.b, alpha)
 	mat.cull_mode       = BaseMaterial3D.CULL_DISABLED
 	mat.depth_draw_mode = BaseMaterial3D.DEPTH_DRAW_DISABLED
+	mat.no_depth_test   = overlay
 	return mat
@@ -17,10 +17,13 @@ var _values: Dictionary = {}

 func _ready() -> void:
 	_register_all()
-	load_saved()


 func _register_all() -> void:
+	#Gamepad vibration
+	_reg_b("Gamepad", "gamepad_vibration", true)
+	#Level Unlocking
+	_reg_b("Gate", "gate_unlocked_bear", false)
 	# ── Movement ──────────────────────────────────────────────────────────────
 	# WASD/arrows drive the bull: move_accel ramps flat velocity toward max_speed in
 	# the input direction; move_friction bleeds it off when no direction is held.
@@ -38,6 +41,10 @@ func _register_all() -> void:
 	# bull_hit_iframes seconds of invulnerability so a single pass can't drain it.
 	_reg_f("Bull",     "bull_max_hp",         10.0,  1.0,   100.0, 1.0)
 	_reg_f("Bull",     "bull_hit_iframes",    0.8,  0.0,    3.0, 0.1)
+	# Half-angle (deg) of the bull's horns-first cone: running into an enemy only wounds it when the
+	# bull's velocity points within this of the enemy (not a sideways brush). 90 = any contact at speed.
+	# (The dash ability bypasses this.)
+	_reg_f("Bull",     "bull_gore_arc",      75.0,  10.0, 180.0, 5.0)
 	# ── Dust speed thresholds ─────────────────────────────────────────────────
 	_reg_f("Dust",     "dust_walk_spd",       1.5,  0.1,  10.0)
 	_reg_f("Dust",     "dust_charge_spd",     7.0,  1.0,  20.0)
@@ -46,12 +53,12 @@ func _register_all() -> void:
 	_reg_f("Dust",     "dust_explosiveness",  0.35, 0.0,   1.0)
 	_reg_f("Dust",     "dust_spread",        45.0,  5.0,  90.0)
 	_reg_f("Dust",     "dust_gravity_y",     -1.5,-15.0,   0.0)
-	_reg_f("Dust",     "walk_scale_min",      0.35, 0.05,  3.0)
-	_reg_f("Dust",     "walk_scale_max",      0.65, 0.05,  3.0)
+	_reg_f("Dust",     "walk_scale_min",      0.20, 0.05,  3.0)
+	_reg_f("Dust",     "walk_scale_max",      0.40, 0.05,  3.0)
 	_reg_f("Dust",     "walk_vel_min",        0.8,  0.1,  12.0)
 	_reg_f("Dust",     "walk_vel_max",        1.8,  0.1,  12.0)
-	_reg_f("Dust",     "charge_scale_min",    1.0,  0.05,  6.0)
-	_reg_f("Dust",     "charge_scale_max",    2.2,  0.05,  6.0)
+	_reg_f("Dust",     "charge_scale_min",    0.35, 0.05,  6.0)
+	_reg_f("Dust",     "charge_scale_max",    0.70, 0.05,  6.0)
 	_reg_f("Dust",     "charge_vel_min",      2.8,  0.1,  20.0)
 	_reg_f("Dust",     "charge_vel_max",      5.5,  0.1,  20.0)
 	# ── Tail ──────────────────────────────────────────────────────────────────
@@ -99,16 +106,12 @@ func _register_all() -> void:
 	_reg_f("Camera",   "cam_drag_speed",     3.5,   0.5,  20.0)
 	_reg_f("Camera",   "cam_follow_lerp",   10.0,   1.0,  40.0)
 	# ── Matador ───────────────────────────────────────────────────────────────
-	_reg_f("Matador",  "mat_spawn_count",     1.0,   1.0,  30.0,  1.0)
-	# Hydra split: a slain matador is replaced on the spot by mat_split_factor fresh
-	# matadors, so the horde doubles each generation (1 → 2 → 4 → 8 …) at the default
-	# 2. Capped at mat_split_generations deep so the arena stays winnable (factor <2 or
-	# generations 0 = no splitting, the classic one-and-done arena).
-	_reg_f("Matador",  "mat_split_factor",      2.0, 1.0,   6.0, 1.0)
-	_reg_f("Matador",  "mat_split_generations", 3.0, 0.0,   6.0, 1.0)
-	# The bull wins outright once it has slain this many matadors, even if the hydra
-	# still has bodies on the sand. 0 = disabled (win only when the horde dies out)
-	_reg_f("Matador",  "mat_win_kills",        21.0, 0.0, 200.0, 1.0)
+	# Wave system: matadors enter the arena in escalating waves (1 → 2 → … → N where N
+	# is the number of placed spawn points). mat_spawn_stagger is the delay between each
+	# matador leaping in within a wave; mat_wave_pause is the breather after a wave clears.
+	_reg_f("Matador",  "mat_wave_size",  8.0,   1,  50)
+	_reg_f("Matador",  "mat_spawn_stagger",   0.4,   0.0,   3.0,  0.05)
+	_reg_f("Matador",  "mat_wave_pause",      2.0,   0.0,   8.0,  0.25)
 	_reg_f("Matador",  "mat_walk_speed",      5.5,   0.5,  10.0)
 	_reg_f("Matador",  "mat_wander_radius",  22.0,   5.0,  50.0)
 	# Radius of the inner fighting floor: bull + matadors spawn on this ring (so
@@ -117,6 +120,9 @@ func _register_all() -> void:
 	_reg_f("Matador",  "mat_idle_min",        1.2,   0.0,   5.0, 0.1)
 	_reg_f("Matador",  "mat_idle_max",        4.0,   0.5,  10.0, 0.1)
 	_reg_f("Matador",  "mat_hit_threshold",   4.0,   1.0,  30.0)
+	# Planar reach at which the bull's swept charge path gores a matador (~bull + HitArea radii).
+	# Raise for a more forgiving charge, lower for a more precise one.
+	_reg_f("Matador",  "mat_charge_gore_radius", 1.2, 0.5,  3.0, 0.05)
 	_reg_f("Matador",  "mat_ragdoll_impulse", 6.0,   0.5,  20.0)
 	# Ragdoll joint limits — lower swing/twist = stiffer corpse that keeps its
 	# shape; higher angular damp settles the flail instead of flopping flat.
@@ -139,21 +145,42 @@ func _register_all() -> void:
 	_reg_f("Matador",  "mat_attack_range",     8.0,  2.0,  20.0)
 	_reg_f("Matador",  "mat_attack_speed",     7.5,  1.0,  12.0)
 	_reg_f("Matador",  "mat_attack_duration",  1.8,  0.5,   5.0, 0.1)
-	_reg_f("Matador",  "mat_attack_min_dist",  3.2,  0.5,   6.0, 0.1)
-	# Forward drive during the opening of a melee swing — turns the stationary stab
-	# into an estocada lunge so the blade covers ground toward the bull.
-	_reg_f("Matador",  "mat_lunge_speed",     13.0,  0.0,  20.0)
-	_reg_f("Matador",  "mat_lunge_time",       0.22, 0.0,   0.6, 0.01)
-	# Reach of the reach-based stab (the reliable melee hit) and its re-strike gap.
-	# The bull dies if it comes inside mat_stab_reach of a matador that's attacking,
-	# bracing, or passing with a drawn blade — closing in is genuinely deadly.
-	_reg_f("Matador",  "mat_stab_reach",       1.7,  0.5,   4.0, 0.1)
+	# Reach of the reach-based melee hit and its re-strike gap. This now governs ONLY the sidestep
+	# PASS (mat charges the bull past with the blade out): a fast lateral sweep where the thin blade
+	# Area would tunnel, so a center-to-center distance check is the reliable gore. The stationary
+	# ATTACK stab no longer uses this — it drives off the sword's BladeHitbox collider (see below).
+	_reg_f("Matador",  "mat_stab_reach",       2.0,  0.5,   4.0, 0.1)
+	# Distance the matador plants at to swing. The ATTACK stab damages off the animated BladeHitbox,
+	# whose thrust reaches ~3.75 m at full extension — so this MUST stay under that or the blade never
+	# touches the bull and the stab whiffs. 3.5 m keeps the matador clear of the bull's ~1.8 m-long
+	# body while the thrust still lands. Raise toward 3.75 for more gap, lower to stab from closer.
+	_reg_f("Matador",  "mat_stab_standoff",    3.5,  0.5,   4.0, 0.1)
+	# Fraction through the Attack clip at which the blade's collider is armed. The clip is guard →
+	# wind-up (blade pulled back, phase ~0.3-0.5) → thrust (blade drives out to ~3.5 m, phase ~0.55+).
+	# Arming at the thrust keeps the bull from being gored during the wind-up (blade not yet extended)
+	# or the guard pose. The BladeHitbox overlap still decides the exact hit; this just gates timing.
+	_reg_f("Matador",  "mat_stab_strike_at",   0.5,  0.0,   1.0, 0.05)
+	# Chance, each time a stab finishes, that the matador breaks off into something else (give ground,
+	# circle, or throw) instead of immediately stabbing again — keeps it from drilling the same thrust
+	# on repeat. 0 = always re-stab if in range, 1 = always break off after every stab.
+	_reg_f("Matador",  "mat_stab_followup_chance", 0.6, 0.0, 1.0, 0.05)
+	# Beat after every stab where the brain won't re-commit to ATTACK, so it can't machine-gun the
+	# bull — it circles/gives ground instead. 0 = stab as fast as range allows.
+	_reg_f("Matador",  "mat_stab_recovery",    0.9,  0.0,   3.0, 0.1)
+	# Chance, when a stab actually CONNECTS, that the matador breaks into a crowd-pleasing taunt and
+	# gives ground instead of pressing — milking the hit rather than spamming. High by design.
+	_reg_f("Matador",  "mat_taunt_after_hit",  0.85, 0.0,   1.0, 0.05)
 	_reg_f("Matador",  "mat_stab_cooldown",    0.6,  0.1,   3.0, 0.1)
 	# Half-angle (deg) the matador must be facing the bull within for a stab to land.
 	# Stops "sword's off to the side but I still died" — you're only gored when the
 	# blade is actually presented at you.
 	_reg_f("Matador",  "mat_stab_arc",        55.0,  5.0, 180.0, 5.0)
-	_reg_f("Matador",  "mat_roll_chance",      0.35, 0.0,   1.0, 0.05)
+	# Chance a matador rolls clear (survives) instead of ragdolling when the bull's charge connects.
+	_reg_f("Matador",  "mat_roll_chance",      0.8, 0.0,   1.0, 0.05)
+	# How much a committed charge pierces the survival roll: roll chance fades toward
+	# mat_roll_chance*(1-this) as bull speed climbs to mat_charge_speed. 1 = full-speed charge always
+	# gores. (A dash connect ignores the roll entirely.)
+	_reg_f("Matador",  "mat_charge_pierce",    0.8, 0.0,   1.0, 0.05)
 	_reg_f("Matador",  "mat_roll_duration",    0.45, 0.1,   1.5, 0.05)
 	# Playback rate of the Draw_weapon clip used for both drawing and sheathing —
 	# higher = snappier unholster/holster.
@@ -190,24 +217,117 @@ func _register_all() -> void:
 	_reg_f("Matador",  "mat_taunt_hold",       8.0,  1.0,  20.0, 0.5)
 	# Small so it smooths dithering without locking the matador into idling.
 	_reg_f("Matador",  "mat_w_commit",         0.15, 0.0,   2.0, 0.05)
+	# ── Bear (boss) ─────────────────────────────────────────────────────────────
+	# A Dark-Souls-style boss with a learnable moveset. It soaks bear_max_hp clean hits
+	# (ram or ability), staggering on each, and only topples when worn down. From NEUTRAL
+	# it weighs its options by the range band to the bull and commits to one telegraphed
+	# routine (wind-up → active → recovery); each routine plays to the end (the recovery
+	# is the player's punish window). Below bear_enrage_frac HP it enters phase 2: faster
+	# tells and recovery (× bear_enrage_scale) and longer combo chains.
+	_reg_f("Bear",     "bear_max_hp",         30.0,  1.0,  100.0, 1.0)
+	# HP fraction at which phase 2 ("Fury") triggers, and how much it multiplies every
+	# wind-up / recovery timer (lower = snappier, more dangerous).
+	_reg_f("Bear",     "bear_enrage_frac",     0.4,  0.0,   1.0, 0.05)
+	_reg_f("Bear",     "bear_enrage_scale",    0.7,  0.3,   1.0, 0.05)
+	# Range bands (m) that pick the moveset: ≤close it strikes (swipe / smash), ≤mid it
+	# walks in to close the gap (stalk) or leaps, beyond it lopes in (prowl) or leaps.
+	# close is deliberately generous — the bear commits to melee "from a bit further" and
+	# steps in during the swing (see bear_lunge_speed) rather than needing to be on top.
+	_reg_f("Bear",     "bear_close_range",     5.0,  1.0,  12.0, 0.1)
+	_reg_f("Bear",     "bear_mid_range",       10.0,  3.0,  20.0, 0.5)
+	_reg_f("Bear",     "bear_long_range",       15.0,  3.0,  100.0, 0.5)
+	# Beat spent in NEUTRAL sizing up the bull between routines — kept short so the bear
+	# flows straight from one action into the next instead of pausing (raise for a more
+	# hesitant, readable boss; near-0 for relentless pressure). Shrinks again in phase 2.
+	_reg_f("Bear",     "bear_think_time",      0.06, 0.0,   1.0, 0.01)
+	# Locomotion: the all-fours prowl (close a big gap), the menacing 2-leg walk-in
+	# (stalk), the facing rate while positioning/winding up, and the softer tracking rate
+	# a swing keeps on the bull mid-attack so it's harder to just walk out of.
+	_reg_f("Bear",     "bear_run_speed",      11.0,  1.0,  20.0, 0.1)
+	_reg_f("Bear",     "bear_stalk_speed",     5.5,  0.5,  12.0, 0.1)
+	_reg_f("Bear",     "bear_turn_rate",       7.0,  1.0,  20.0, 0.5)
+	_reg_f("Bear",     "bear_track_active",    3.5,  0.0,  12.0, 0.1)
+	# Forward step-in during a swing so a strike lands even when the bull is a touch out of
+	# reach (also carries the tracking); 0 = a purely stationary swing.
+	_reg_f("Bear",     "bear_lunge_speed",     7.0,  0.0,  16.0, 0.5)
+	# Playback multiplier for the swipe/smash clips — >1 makes the punches snappier.
+	_reg_f("Bear",     "bear_attack_anim_speed", 1.35, 0.5, 3.0, 0.05)
+	# Half-arc (deg) the bear must be facing the bull within for a directional swing to
+	# connect; slams use their own radius instead of an arc.
+	_reg_f("Bear",     "bear_hit_arc",        70.0,  5.0, 180.0, 5.0)
+	# Double Swipe (ONE_TWO_HIT) — bread-and-butter close combo, two quick hits.
+	_reg_f("Bear",     "bear_swipe_windup",    0.3,  0.05,  2.0, 0.05)
+	_reg_f("Bear",     "bear_swipe_recover",   0.35, 0.05,  3.0, 0.05)
+	_reg_f("Bear",     "bear_swipe_reach",     4.2,  1.0,   8.0, 0.1)
+	# Which claw-slash FX plays on the first vs second swipe hit — the L/R clips are easy to
+	# mix up, so 0 = first hit L then R, 1 = swap them. Purely cosmetic (no gameplay effect).
+	_reg_f("Bear",     "bear_fx_claw_swap",    0.0,  0.0,   1.0, 1.0)
+	# Live yaw (deg) applied to the whole Bear_FX node before each effect fires, so the claw
+	# rake / debris can be spun to line up with the bear's facing by eye. Bake the good value.
+	_reg_f("Bear",     "bear_fx_yaw",          0.0, -180.0, 180.0, 5.0)
+	# The baked crater clip only pops up (no shrink), so hold it on the ground this long after a
+	# leap slam before hiding it — otherwise it flashes for a single frame and reads as invisible.
+	_reg_f("Bear",     "bear_fx_crater_linger", 0.8,  0.0,   3.0, 0.1)
+	# Overhead Smash (SMASH_HIT) — slower tell, biggest punish window, AoE on impact.
+	_reg_f("Bear",     "bear_smash_windup",    0.6,  0.1,   3.0, 0.05)
+	_reg_f("Bear",     "bear_smash_recover",   0.75, 0.1,   4.0, 0.05)
+	# The overhead smash's hitbox is a forward box lane whose size + travel are authored in
+	# BearAttackHitboxes.tscn's AnimationPlayer ("smash_travel"). Here we only set the upward
+	# pop the bull takes off its feet at the far end (it ramps 0→this with hit distance).
+	_reg_f("Bear",     "bear_smash_knockup",   6.0,  0.0,  16.0, 0.5)
+	# Leap Slam (JUMP_SMASH, 47 frames @30fps) — timed to the clip by FRAME: it plays the
+	# crouch grounded, springs at the takeoff frame, and the arc is solved so the paws hit
+	# ground exactly on the impact frame (25), leaving the tail frames to settle on the
+	# ground — no finishing the anim in mid-air. The arc uses its own gravity so peak height
+	# and airtime are independent: bear_leap_height is the peak reached in that fixed airtime.
+	_reg_f("Bear",     "bear_leap_takeoff_frame",  6.0,  0.0, 46.0, 1.0)
+	_reg_f("Bear",     "bear_leap_impact_frame",  25.0,  1.0, 47.0, 1.0)
+	_reg_f("Bear",     "bear_leap_height",     2.6,  0.5,   8.0, 0.1)
+	_reg_f("Bear",     "bear_leap_recover",    0.35, 0.0,   4.0, 0.05)
+	_reg_f("Bear",     "bear_leap_speed",     14.0,  4.0,  30.0, 0.5)
+	# Where the leap-slam launch zone starts, as a fraction of the circle radius. 0 = launch anywhere
+	# inside; raise to carve a grounded inner zone that only mauls (0.75 = only the outer quarter ring).
+	_reg_f("Bear",     "bear_leap_ring_frac",  0.0,  0.0,   1.0, 0.05)
+	_reg_f("Bear",     "bear_leap_knockup",    7.0,  0.0,  16.0, 0.5)
+	# Stalk (WALK_ON2LEGS) — how long it will keep walking the bull down before re-deciding.
+	_reg_f("Bear",     "bear_stalk_time",      2.5,  0.0,   6.0, 0.1)
+	# Odds a close combo chains a follow-up smash after the swipe (phase 2 always chains).
+	_reg_f("Bear",     "bear_combo_chance",    0.7,  0.0,   1.0, 0.05)
+	# Minimum bull speed (ram) that counts as a hit on the bear — a gentle nudge is
+	# shrugged off, only a real charge or an ability wounds it. (The bear itself never
+	# damages the bull by colliding — only its swings and slams hurt.)
+	_reg_f("Bear",     "bear_hit_threshold",   6.0,  1.0,  30.0, 0.5)
+	# Planar reach at which a horns-first bull charge wounds the bear (~bear body radius + bull reach).
+	# The bull's swept path is tested against this, so a tunnelling or point-blank charge still lands.
+	_reg_f("Bear",     "bear_ram_reach",       2.1,  0.5,   5.0, 0.1)
+	# How long (s) the bear is rocked back and can't act after taking a hit.
+	_reg_f("Bear",     "bear_stagger_time",    0.5,  0.0,   2.0, 0.05)
+	# Poise: after a stagger the bear shrugs off staggers for this long (hits still wound
+	# it), so it can't be perma-stunlocked — it gets a window to commit an attack that then
+	# rides its hyper-armour. 0 = no poise (stun-locks under sustained fire).
+	_reg_f("Bear",     "bear_stagger_cd",      1.0,  0.0,   4.0, 0.05)
 	# ── Sword ─────────────────────────────────────────────────────────────────
 	# Local seating of the sword in the right hand (drawn / fighting).
-	# Defaults are identity — the bone is oriented in Blender to seat the sword
-	# directly; these exist to fine-tune in-game without re-exporting.
+	# The blade model runs along its local +Z, but weapon_bone (like every rig bone)
+	# points down its local +Y — so identity leaves the blade jutting out sideways.
+	# rot_x = -90 maps the blade's +Z onto the bone's +Y so it thrusts straight along
+	# the bone; rot_y is then the free roll (crossguard tilt) about the blade axis.
 	_reg_f("Sword",    "sword_pos_x",          0.0, -1.0,   1.0, 0.01)
 	_reg_f("Sword",    "sword_pos_y",          0.0, -1.0,   1.0, 0.01)
 	_reg_f("Sword",    "sword_pos_z",          0.0, -1.0,   1.0, 0.01)
-	_reg_f("Sword",    "sword_rot_x",          0.0, -180.0, 180.0, 1.0)
+	_reg_f("Sword",    "sword_rot_x",        -90.0, -180.0, 180.0, 1.0)
 	_reg_f("Sword",    "sword_rot_y",          0.0, -180.0, 180.0, 1.0)
 	_reg_f("Sword",    "sword_rot_z",          0.0, -180.0, 180.0, 1.0)
 	# Local seating of the sword in the hip holster (sheathed / wandering).
 	# Independent of the hand grip so each pose can be tuned without affecting the
-	# other. Defaults angle the blade down along the matador's side.
+	# other. weapon_rest_bone sits on the left hip; these angle the blade down and
+	# out along the OUTSIDE of the left thigh (rot_x/rot_y aim the blade, rot_z rolls
+	# it about its own axis) so it trails back beside the leg instead of clipping it.
 	_reg_f("Sword",    "sword_rest_pos_x",     0.0, -1.0,   1.0, 0.01)
 	_reg_f("Sword",    "sword_rest_pos_y",     0.0, -1.0,   1.0, 0.01)
 	_reg_f("Sword",    "sword_rest_pos_z",     0.0, -1.0,   1.0, 0.01)
-	_reg_f("Sword",    "sword_rest_rot_x",   -120.0, -180.0, 180.0, 1.0)
-	_reg_f("Sword",    "sword_rest_rot_y",     0.0, -180.0, 180.0, 1.0)
+	_reg_f("Sword",    "sword_rest_rot_x",   -110.0, -180.0, 180.0, 1.0)
+	_reg_f("Sword",    "sword_rest_rot_y",   -133.0, -180.0, 180.0, 1.0)
 	_reg_f("Sword",    "sword_rest_rot_z",     0.0, -180.0, 180.0, 1.0)
 	# ── Spear throw (matador ranged attack) ──────────────────────────────────
 	# Local seating of the spear in the throwing hand during the wind-up. Tune to
@@ -238,10 +358,10 @@ func _register_all() -> void:
 	_reg_f("Sword",    "mat_throw_arm_release", -90.0,-180.0, 180.0, 1.0)
 	_reg_f("Sword",    "mat_throw_elbow",     80.0,-180.0, 180.0, 1.0)
 	# ── Abilities ─────────────────────────────────────────────────────────────
-	_reg_f("Abilities", "kick_cooldown",   1.5,   0.2,  10.0, 0.1)
+	_reg_f("Abilities", "kick_cooldown",   2,   0.2,  600, 0.1)
 	_reg_f("Abilities", "kick_range",      6.0,   0.5,   8.0, 0.1)
 	_reg_f("Abilities", "kick_strength",  12.0,   1.0,  30.0)
-	_reg_f("Abilities", "slam_cooldown",      4.0,   0.5,  15.0, 0.1)
+	_reg_f("Abilities", "slam_cooldown",      12,   0.5,  600, 0.1)
 	_reg_f("Abilities", "slam_jump_velocity", 7.0,   2.0,  20.0)
 	# Descent gravity multiplier — higher = faster crash, less airtime.
 	_reg_f("Abilities", "slam_fall_mult",     3.0,   1.0,   8.0, 0.5)
@@ -250,7 +370,7 @@ func _register_all() -> void:
 	_reg_f("Abilities", "slam_launch_up",     7.0,   0.0,  15.0, 0.5)
 	_reg_f("Abilities", "slam_range",         4.0,   1.0,  10.0, 0.1)
 	_reg_f("Abilities", "slam_strength",     14.0,   1.0,  30.0)
-	_reg_f("Abilities", "dash_cooldown",   0.5,   0.1,  10.0, 0.1)
+	_reg_f("Abilities", "dash_cooldown",   3,   0.1,  600.0, 0.1)
 	_reg_f("Abilities", "dash_speed",     66.0,   5.0, 200.0)
 	# Exponential rate the dash bleeds from dash_speed back to cruise (max_speed).
 	# Higher = a snappier bullet that dies off quicker; lower = a longer glide.
@@ -261,7 +381,7 @@ func _register_all() -> void:
 	# closest matador; on slamming one the ball POPS it (launched skyward via
 	# roll_knockup) then CHAINS to the next closest, up to roll_chain_count times.
 	# roll_turn is the homing turn rate. When no chain targets remain, the roll ends.
-	_reg_f("Roll",     "roll_cooldown",     3.0,   0.5,  15.0, 0.1)
+	_reg_f("Roll",     "roll_cooldown",     20,   0.5,  600, 0.1)
 	_reg_f("Roll",     "roll_duration",     2.5,   0.5,   6.0, 0.1)   # max roll time
 	_reg_f("Roll",     "roll_chain_count",  2.0,   0.0,   8.0, 1.0)   # extra matadors chained after the first
 	_reg_f("Roll",     "roll_base_speed",  28.0,   5.0, 120.0)        # speed at the start of the roll
@@ -273,7 +393,6 @@ func _register_all() -> void:
 	_reg_f("Roll",     "roll_hit_strength", 22.0,  1.0,  40.0)        # horizontal launch on the pop
 	_reg_f("Roll",     "roll_knockup",     11.0,   0.0,  25.0)        # vertical knock-up on the pop
 	# ── Debug overlays (see debug_draw.gd) ───────────────────────────────────
-	_reg_b("Debug",    "show_collisions",     false)
 	# PS1 post-process filter (see ps1_filter.gd on the fullscreen ColorRect):
 	# screen-covering CRT/PS1 shader — pixelation, colour-banding + dither, and a
 	# rolling scanline. Keys map 1:1 onto the shader uniforms; show_ps1 toggles the
@@ -281,12 +400,13 @@ func _register_all() -> void:
 	# a uniform out of bounds.
 	_reg_b("PS1",      "show_ps1",             true)
 	_reg_f("PS1",      "ps1_pixel_scale",      4.0,  1.0,  8.0,  1.0)
-	_reg_f("PS1",      "ps1_color_depth",      5.0,  2.0,  8.0,  1.0)
-	_reg_f("PS1",      "ps1_dither_strength",  0.8,  0.0,  2.0,  0.05)
+	_reg_f("PS1",      "ps1_color_depth",      4.5,  2.0,  8.0,  1.0)
+	_reg_f("PS1",      "ps1_dither_strength",  1,  0.0,  2.0,  0.05)
 	_reg_f("PS1",      "ps1_scanline_strength", 0.2, 0.0,  1.0,  0.05)
 	_reg_f("PS1",      "ps1_roll_speed",       3.0,  0.0, 10.0,  0.1)
 	_reg_f("PS1",      "ps1_roll_strength",    1.0,  0.0,  1.0,  0.05)
 	_reg_b("Debug",    "show_hitboxes",       false)
+	_reg_b("Debug",    "show_attacks",        false)
 	_reg_b("Debug",    "show_bones",          false)
 	_reg_b("Debug",    "show_raycasts",       false)
 	_reg_b("Debug",    "show_tail",           false)
@@ -299,6 +419,17 @@ func _register_all() -> void:
 	# Force the on-screen touch controls (joystick + ability buttons) on even on a
 	# desktop build — otherwise they appear only when a touchscreen is detected.
 	_reg_b("Touch",    "force_touch_controls", false)
+	# On-screen readout of live touch state (event count, last position, active zone) so
+	# touch problems can be diagnosed on the actual device, where no console is reachable.
+	_reg_b("Touch",    "touch_debug",          false)
+	# Rebuild skinned characters as rigid, bone-attached mesh pieces instead of GPU vertex
+	# skinning. This was a workaround for older Mali/ANGLE web GPUs where Compatibility skinning
+	# rendered characters invisible — but the Godot 4.7 web templates fixed that (confirmed
+	# on-device), so native skinning is now the default everywhere: it renders the bear's dense
+	# mesh without the rigid-seam holes AND drops the per-spawn SurfaceTool rebuild that was
+	# spiking the arena on matador spawn. Kept as an opt-in fallback (DP toggle, or ?skin=1 in
+	# the URL) in case a device is found where Compatibility skinning still fails.
+	_reg_b("Render",   "use_rigid_skin",       false)


 func _reg_f(section: String, key: String, default: float,
@@ -349,11 +480,54 @@ func get_all() -> Dictionary:


 func save() -> void:
-	var cfg := ConfigFile.new()
+	var path := "res://debug_params.gd"
+	var file := FileAccess.open(path, FileAccess.READ)
+	if file == null:
+		push_error("DP.save: cannot open " + path)
+		return
+	var src := file.get_as_text()
+	file.close()
+
 	for key: String in _params:
 		var p: Dictionary = _params[key]
-		cfg.set_value(p["section"], key, p["value"])
-	cfg.save(SAVE_PATH)
+		if p["value"] == p["default"]:
+			continue
+		var re := RegEx.new()
+		var literal := ""
+		if p["type"] == TYPE_FLOAT:
+			re.compile('(_reg_f\\("[^"]+",\\s*"%s",\\s*)([-\\d.e]+)' % key)
+			literal = _fmt_float(p["value"] as float)
+		else:
+			re.compile('(_reg_b\\("[^"]+",\\s*"%s",\\s*)(true|false)' % key)
+			literal = "true" if bool(p["value"]) else "false"
+		var m := re.search(src)
+		if m == null:
+			push_warning("DP.save: no _reg_ line found for '%s' — skipped" % key)
+			continue
+		# Splice the value in by index rather than RegEx.sub(): sub()'s replacement
+		# string parses "$n" as a backreference, so "$1"+"12.5" becomes "$112.5"
+		# (group 112 → PCRE2 error → mangled output). Indexed splice inserts the
+		# literal verbatim, exactly the value the user entered.
+		src = src.substr(0, m.get_start(2)) + literal + src.substr(m.get_end(2))
+		p["default"] = p["value"]
+
+	var wfile := FileAccess.open(path, FileAccess.WRITE)
+	if wfile == null:
+		push_error("DP.save: cannot write " + path)
+		return
+	wfile.store_string(src)
+	wfile.close()
+
+
+# Godot's String % operator has no "g" conversion — "%.6g" % v slips past the
+# compiler (v is not const) but emits the literal "%.6g" at runtime, which would be
+# written straight into the source. "%s" gives the shortest round-tripping form,
+# matching the value the user entered; the guard keeps it a float literal.
+func _fmt_float(v: float) -> String:
+	var s := "%s" % v
+	if not ("." in s or "e" in s):
+		s += ".0"
+	return s


 func load_saved() -> void:
@@ -34,10 +34,28 @@ commit=${GIT_COMMIT}
 built=${BUILD_DATE}
 EOF

+# Cache-bust: give wasm/pck unique names so browsers never serve a stale build.
+# index.js gets a ?v= query string; wasm/pck get renamed because the engine
+# fetches them internally using GODOT_CONFIG.executable as the base name.
+STAMP="$GIT_COMMIT"
+cp "$BUILD_DIR/index.wasm"    "$BUILD_DIR/index.${STAMP}.wasm"
+cp "$BUILD_DIR/index.wasm.gz" "$BUILD_DIR/index.${STAMP}.wasm.gz"
+cp "$BUILD_DIR/index.pck"     "$BUILD_DIR/index.${STAMP}.pck"
+
+sed -i \
+  -e "s|src=\"index\.js\"|src=\"index.js?v=${STAMP}\"|" \
+  -e "s|\"executable\":\"index\"|\"executable\":\"index.${STAMP}\"|" \
+  -e "s|\"index\.pck\"|\"index.${STAMP}.pck\"|g" \
+  -e "s|\"index\.wasm\"|\"index.${STAMP}.wasm\"|g" \
+  "$BUILD_DIR/index.html"
+
+# Remove previous build's versioned assets from the server before uploading.
+ssh "$SERVER_USER@$SERVER_HOST" "find $SERVER_PATH -maxdepth 1 -name 'index.*.wasm' -o -name 'index.*.wasm.gz' -o -name 'index.*.pck' | xargs -r rm -f"
+
 scp "$BUILD_DIR/index.html" \
    "$BUILD_DIR/index.js" \
-    "$BUILD_DIR/index.wasm.gz" \
-    "$BUILD_DIR/index.pck" \
+    "$BUILD_DIR/index.${STAMP}.wasm.gz" \
+    "$BUILD_DIR/index.${STAMP}.pck" \
    "$BUILD_DIR/index.audio.worklet.js" \
    "$BUILD_DIR/index.audio.position.worklet.js" \
    "$BUILD_DIR/index.icon.png" \
@@ -46,4 +64,4 @@ scp "$BUILD_DIR/index.html" \
    "$BUILD_DIR/version.txt" \
    "$SERVER_USER@$SERVER_HOST:$SERVER_PATH/"

-echo "deployed ${VERSION} to $SERVER_HOST:$SERVER_PATH"
+echo "deployed ${VERSION} (${STAMP}) to $SERVER_HOST:$SERVER_PATH"
@@ -1,18 +1,30 @@
+[runnable_presets]
+
+Web="Web"
+"Windows Desktop"="Windows Desktop"
+
 [preset.0]

 name="Web"
 platform="Web"
-runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
 export_path="build/web/index.html"
+patches=PackedStringArray()
+patch_delta_encoding=false
+patch_delta_compression_level_zstd=19
+patch_delta_min_reduction=0.1
+patch_delta_include_filters="*"
+patch_delta_exclude_filters=""
 encryption_include_filters=""
 encryption_exclude_filters=""
+seed=0
 encrypt_pck=false
 encrypt_directory=false
+script_export_mode=2

 [preset.0.options]

@@ -21,7 +33,7 @@ custom_template/release=""
 variant/extensions_support=false
 variant/thread_support=true
 vram_texture_compression/for_desktop=true
-vram_texture_compression/for_mobile=false
+vram_texture_compression/for_mobile=true
 html/export_icon=true
 html/custom_html_shell=""
 html/head_include=""
@@ -29,6 +41,7 @@ html/canvas_resize_policy=2
 html/focus_canvas_on_start=true
 html/experimental_virtual_keyboard=false
 progressive_web_app/enabled=false
+progressive_web_app/ensure_cross_origin_isolation_headers=true
 progressive_web_app/offline_page=""
 progressive_web_app/display=1
 progressive_web_app/orientation=0
@@ -36,3 +49,76 @@ progressive_web_app/icon_144x144=""
 progressive_web_app/icon_180x180=""
 progressive_web_app/icon_512x512=""
 progressive_web_app/background_color=Color(0, 0, 0, 1)
+threads/emscripten_pool_size=8
+threads/godot_pool_size=4
+
+[preset.1]
+
+name="Windows Desktop"
+platform="Windows Desktop"
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="../Export/Bullosseum_020.exe"
+patches=PackedStringArray()
+patch_delta_encoding=false
+patch_delta_compression_level_zstd=19
+patch_delta_min_reduction=0.1
+patch_delta_include_filters="*"
+patch_delta_exclude_filters=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.1.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=1
+binary_format/embed_pck=false
+texture_format/s3tc_bptc=true
+texture_format/etc2_astc=false
+shader_baker/enabled=false
+binary_format/architecture="x86_64"
+codesign/enable=false
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PackedStringArray()
+application/modify_resources=true
+application/icon=""
+application/console_wrapper_icon=""
+application/icon_interpolation=4
+application/file_version=""
+application/product_version=""
+application/company_name=""
+application/product_name=""
+application/file_description=""
+application/copyright=""
+application/trademarks=""
+application/export_angle=0
+application/export_d3d12=0
+application/d3d12_agility_sdk_multiarch=true
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
+$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
+$trigger = New-ScheduledTaskTrigger -Once -At 00:00
+$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries
+$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
+Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
+Start-ScheduledTask -TaskName godot_remote_debug
+while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
+ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
+Remove-Item -Recurse -Force '{temp_dir}'"
@@ -0,0 +1,59 @@
+# FX — the effect library
+
+Gameplay code fires a **named** effect; the **scene** decides how it looks. That split is the whole
+point: a programmer writes `Fx.spawn(&"blood_burst", hit_transform)` once, and from then on every
+change to how a hit *feels* is a `.tscn` Siim edits in the inspector — no code, no recompile.
+
+```gdscript
+# anywhere in gameplay code
+Fx.spawn(&"blood_burst", global_transform)          # at a node
+Fx.spawn(&"slam_dust", Transform3D(Basis(), point)) # at a world point
+```
+
+## Siim's workflow
+
+1. **Open the gallery.** Run `fx/effect_gallery.tscn`. It loops through every effect on a sand-lit
+   stage with the effect's name on screen, so you see each one the way it reads in play.
+2. **Pick an effect** `.tscn` in `fx/` (`blood_burst`, `slam_dust`, `spark`, `hit_flash`) and open it.
+3. **Tune it in the inspector.** Everything lives on the `CPUParticles3D` node and its material:
+   - **Colour** → the node's *Color Ramp* (start colour → faded/transparent end).
+   - **Shape of the burst over time** → *Scale Amount Curve*.
+   - **Amount / Lifetime / Explosiveness / Spread / Velocity / Gravity** → the node's emission group.
+   - The viewport previews particles live as you drag — no play needed.
+4. **Save.** That's the whole edit. Re-run the gallery to compare.
+
+New effect? Add a `fx/<name>.tscn` (root = `CPUParticles3D` with `one_shot_effect.gd` attached — copy
+an existing one), then register its name → path in `fx/fx.gd`.
+
+## House style (keep effects reading as one game)
+
+**Palette** — pull from these, don't invent per-effect colours:
+
+| Role  | Start                     | End (fades to alpha 0)      |
+|-------|---------------------------|-----------------------------|
+| Blood | `#FF0505`                 | `#400000`                   |
+| Dust  | `#B89966` (tan)           | `#8C7326`                   |
+| Ember | `#FFF299` → `#FF8C1A`     | transparent                 |
+| Flash | `#FFFFFF`                 | transparent                 |
+
+**Timing budgets** — hits read best short: strike/flash effects ≤ **0.4 s**, dust/settle ≤ **1.1 s**.
+A one-shot effect frees itself `lifetime + 0.5 s` after spawn (`one_shot_effect.gd`), so keep
+`lifetime` honest.
+
+**PS1 look** — materials are **unshaded**, **alpha-blended**, **vertex-colour** (colour comes from the
+ramp), cull disabled. Prefer few, chunky, low-poly billboarded quads over dense fine particles; the
+game runs the PS1 filter over everything, so subtlety is lost anyway.
+
+**Mobile** — effects are **`CPUParticles3D`, never `GPUParticles3D`**. The web/GLES3/ANGLE target
+compiles particle shaders badly (see the notes in `player.gd`); CPU particles are just as tunable in
+the inspector and safe on-device. Keep this constraint when adding effects.
+
+## Files
+
+| File | What it is |
+|---|---|
+| `fx.gd` | The `Fx` autoload — `spawn(name, xform, parent=null)`; name→path registry |
+| `one_shot_effect.gd` | Root helper: fires the emitter(s) once, frees the scene when done |
+| `blood_burst.tscn` etc. | The effects themselves — **edit these** |
+| `effect_gallery.tscn` | Preview stage (run it to review) |
+| `_seed_placeholders.gd` | One-off generator that wrote the first-draft defaults; not used at runtime |
@@ -0,0 +1,200 @@
+extends SceneTree
+## Seeds the placeholder effect .tscn (and the gallery scene) once, headless. Those .tscn are the
+## source of truth Siim edits in the inspector — this script only builds their first-draft defaults
+## (ported from the old code-built particles). Re-run only to reset a placeholder from scratch:
+##   godot --headless --script fx/_seed_placeholders.gd
+
+const _EFFECT_SCRIPT := "res://fx/one_shot_effect.gd"
+const _GALLERY_SCRIPT := "res://fx/effect_gallery.gd"
+
+
+func _init() -> void:
+	_seed_blood_burst()
+	_seed_slam_dust()
+	_seed_spark()
+	_seed_hit_flash()
+	_seed_gallery()
+	print("Seeded FX placeholder scenes into res://fx/")
+	quit()
+
+
+# ── shared builders ─────────────────────────────────────────────────────────
+func _unshaded() -> StandardMaterial3D:
+	var m := StandardMaterial3D.new()
+	m.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+	m.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
+	m.vertex_color_use_as_albedo = true
+	m.cull_mode = BaseMaterial3D.CULL_DISABLED
+	return m
+
+
+func _sphere(radius: float) -> SphereMesh:
+	var s := SphereMesh.new()
+	s.radius = radius
+	s.height = radius * 2.0
+	s.radial_segments = 4
+	s.rings = 2
+	s.material = _unshaded()
+	return s
+
+
+func _ramp(c0: Color, c1: Color) -> Gradient:
+	var g := Gradient.new()
+	g.set_color(0, c0)
+	g.set_color(1, c1)
+	return g
+
+
+func _curve(points: Array) -> Curve:
+	var c := Curve.new()
+	for pt: Vector2 in points:
+		c.add_point(pt)
+	return c
+
+
+func _save(p: CPUParticles3D, path: String) -> void:
+	p.set_script(load(_EFFECT_SCRIPT))
+	var packed := PackedScene.new()
+	packed.pack(p)
+	ResourceSaver.save(packed, path)
+	p.free()
+
+
+# ── the placeholders (defaults ported from the old code-built particles) ─────
+func _seed_blood_burst() -> void:
+	var p := CPUParticles3D.new()
+	p.name = "blood_burst"
+	p.mesh = _sphere(0.07)
+	p.color_ramp = _ramp(Color(1.0, 0.02, 0.02, 1.0), Color(0.25, 0.0, 0.0, 0.0))
+	p.scale_amount_curve = _curve([Vector2(0.0, 1.0), Vector2(0.6, 0.5), Vector2(1.0, 0.0)])
+	p.emitting = false
+	p.one_shot = true
+	p.explosiveness = 0.9
+	p.amount = 25
+	p.lifetime = 1.1
+	p.randomness = 0.4
+	p.local_coords = false
+	p.direction = Vector3(0.0, 1.0, 0.0)
+	p.spread = 80.0
+	p.gravity = Vector3(0.0, -7.0, 0.0)
+	p.initial_velocity_min = 4.0
+	p.initial_velocity_max = 11.0
+	p.scale_amount_min = 0.5
+	p.scale_amount_max = 1.6
+	_save(p, "res://fx/blood_burst.tscn")
+
+
+func _seed_slam_dust() -> void:
+	var p := CPUParticles3D.new()
+	p.name = "slam_dust"
+	p.mesh = _sphere(0.16)
+	p.color_ramp = _ramp(Color(0.72, 0.60, 0.40, 0.9), Color(0.55, 0.45, 0.30, 0.0))
+	p.scale_amount_curve = _curve([Vector2(0.0, 0.4), Vector2(0.35, 1.0), Vector2(1.0, 0.0)])
+	p.emitting = false
+	p.one_shot = true
+	p.explosiveness = 1.0
+	p.amount = 36
+	p.lifetime = 0.9
+	p.randomness = 0.5
+	p.local_coords = false
+	p.emission_shape = CPUParticles3D.EMISSION_SHAPE_SPHERE
+	p.emission_sphere_radius = 0.5
+	p.direction = Vector3(0.0, 1.0, 0.0)
+	p.spread = 75.0
+	p.gravity = Vector3(0.0, -6.0, 0.0)
+	p.initial_velocity_min = 2.5
+	p.initial_velocity_max = 6.5
+	p.scale_amount_min = 0.6
+	p.scale_amount_max = 1.4
+	_save(p, "res://fx/slam_dust.tscn")
+
+
+func _seed_spark() -> void:
+	var p := CPUParticles3D.new()
+	p.name = "spark"
+	p.mesh = _sphere(0.03)
+	p.color_ramp = _ramp(Color(1.0, 0.95, 0.6, 1.0), Color(1.0, 0.55, 0.1, 0.0))
+	p.scale_amount_curve = _curve([Vector2(0.0, 1.0), Vector2(1.0, 0.0)])
+	p.emitting = false
+	p.one_shot = true
+	p.explosiveness = 1.0
+	p.amount = 14
+	p.lifetime = 0.35
+	p.randomness = 0.6
+	p.local_coords = false
+	p.direction = Vector3(0.0, 1.0, 0.0)
+	p.spread = 45.0
+	p.gravity = Vector3(0.0, -9.0, 0.0)
+	p.initial_velocity_min = 3.0
+	p.initial_velocity_max = 7.0
+	p.scale_amount_min = 0.4
+	p.scale_amount_max = 1.0
+	_save(p, "res://fx/spark.tscn")
+
+
+func _seed_hit_flash() -> void:
+	var p := CPUParticles3D.new()
+	p.name = "hit_flash"
+	p.mesh = _sphere(0.05)
+	p.color_ramp = _ramp(Color(1.0, 1.0, 1.0, 1.0), Color(1.0, 1.0, 1.0, 0.0))
+	p.scale_amount_curve = _curve([Vector2(0.0, 0.2), Vector2(0.3, 1.2), Vector2(1.0, 0.0)])
+	p.emitting = false
+	p.one_shot = true
+	p.explosiveness = 1.0
+	p.amount = 6
+	p.lifetime = 0.18
+	p.randomness = 0.2
+	p.local_coords = false
+	p.spread = 180.0
+	p.gravity = Vector3.ZERO
+	p.initial_velocity_min = 0.5
+	p.initial_velocity_max = 1.5
+	p.scale_amount_min = 0.8
+	p.scale_amount_max = 1.4
+	_save(p, "res://fx/hit_flash.tscn")
+
+
+func _seed_gallery() -> void:
+	var root_node := Node3D.new()
+	root_node.name = "EffectGallery"
+
+	var cam := Camera3D.new()
+	cam.name = "Camera3D"
+	cam.transform = Transform3D(Basis.from_euler(Vector3(deg_to_rad(-18.0), 0.0, 0.0)), Vector3(0.0, 2.0, 4.5))
+	root_node.add_child(cam)
+	cam.owner = root_node
+
+	var light := DirectionalLight3D.new()
+	light.name = "Sun"
+	light.rotation_degrees = Vector3(-50.0, -30.0, 0.0)
+	root_node.add_child(light)
+	light.owner = root_node
+
+	var ground := MeshInstance3D.new()
+	ground.name = "Ground"
+	var plane := PlaneMesh.new()
+	plane.size = Vector2(12.0, 12.0)
+	var gmat := StandardMaterial3D.new()
+	gmat.albedo_color = Color(0.62, 0.53, 0.36)
+	plane.material = gmat
+	ground.mesh = plane
+	root_node.add_child(ground)
+	ground.owner = root_node
+
+	var ui := CanvasLayer.new()
+	ui.name = "UI"
+	root_node.add_child(ui)
+	ui.owner = root_node
+	var label := Label.new()
+	label.name = "Label"
+	label.position = Vector2(24.0, 20.0)
+	label.text = "FX gallery"
+	label.add_theme_font_size_override("font_size", 28)
+	ui.add_child(label)
+	label.owner = root_node
+
+	root_node.set_script(load(_GALLERY_SCRIPT))
+	var packed := PackedScene.new()
+	packed.pack(root_node)
+	ResourceSaver.save(packed, "res://fx/effect_gallery.tscn")
+	root_node.free()
@@ -0,0 +1 @@
+uid://csbp6mkg257uy
@@ -0,0 +1,42 @@
+[gd_scene format=3]
+
+[ext_resource type="Script" path="res://fx/one_shot_effect.gd" id="1_l68fm"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_okatq"]
+transparency = 1
+cull_mode = 2
+shading_mode = 0
+vertex_color_use_as_albedo = true
+
+[sub_resource type="SphereMesh" id="SphereMesh_n7uw4"]
+material = SubResource("StandardMaterial3D_okatq")
+radius = 0.07
+height = 0.14
+radial_segments = 4
+rings = 2
+
+[sub_resource type="Curve" id="Curve_a71nq"]
+_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.6, 0.5), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 3
+
+[sub_resource type="Gradient" id="Gradient_mhqc0"]
+colors = PackedColorArray(1, 0.02, 0.02, 1, 0.25, 0, 0, 0)
+
+[node name="blood_burst" type="CPUParticles3D" unique_id=1553421910]
+emitting = false
+amount = 25
+lifetime = 1.1
+one_shot = true
+explosiveness = 0.9
+randomness = 0.4
+mesh = SubResource("SphereMesh_n7uw4")
+direction = Vector3(0, 1, 0)
+spread = 80.0
+gravity = Vector3(0, -7, 0)
+initial_velocity_min = 4.0
+initial_velocity_max = 11.0
+scale_amount_min = 0.5
+scale_amount_max = 1.6
+scale_amount_curve = SubResource("Curve_a71nq")
+color_ramp = SubResource("Gradient_mhqc0")
+script = ExtResource("1_l68fm")
@@ -0,0 +1,30 @@
+extends Node3D
+## Live preview stage for the FX library. Cycles through every registered effect on a loop against
+## arena-ish lighting so Siim sees each one as it reads in-game. Open fx/effect_gallery.tscn and
+## press Play, then edit any effect .tscn in the inspector and re-run to compare. See fx/README.md.
+
+const _CYCLE_SEC := 1.6
+const _EFFECTS: Array[StringName] = [&"blood_burst", &"slam_dust", &"spark", &"hit_flash"]
+
+@onready var _label: Label = $UI/Label
+# Reached by path rather than the Fx global so the placeholder-seeder can compile and attach this
+# script headless (autoload globals aren't resolvable during an on-demand compile in a --script run).
+@onready var _fx: Node = get_node("/root/Fx")
+
+var _index := 0
+
+
+func _ready() -> void:
+	var timer := Timer.new()
+	timer.wait_time = _CYCLE_SEC
+	timer.autostart = true
+	add_child(timer)
+	timer.timeout.connect(_fire_next)
+	_fire_next()
+
+
+func _fire_next() -> void:
+	var effect := _EFFECTS[_index % _EFFECTS.size()]
+	_index += 1
+	_label.text = "%s   (%d/%d)" % [effect, (_index - 1) % _EFFECTS.size() + 1, _EFFECTS.size()]
+	_fx.call("spawn", effect, global_transform.translated_local(Vector3(0.0, 0.25, 0.0)))
@@ -0,0 +1 @@
+uid://bu2r8vtpfpwe7
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
richard	9c4563a973	Complete the DamageEvent migration: one deal() entry point for every attacker The bull's Hitbox already routed through DamageEvent, but the spear, the bear's maul, and the matador's reach-gore still did raw Object.call(&"take_sword_hit", ...) — the exact scattered string paths DamageEvent was meant to retire. Add a single static DamageEvent.deal(target, cause, at, source, knock_up) that builds the typed event and hands it to receive_damage(), falling back to the legacy string call for any not-yet-migrated victim, and route all four attackers (Hitbox included) through it. The damage_pipeline characterization test proves the bull's outcomes are unchanged. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Pq1VX2o1ZfiNRdCjD294wf	2026-09-05 10:52:10 +03:00
richard	ffe3052468	Fix stale logic-test reference to renamed param mat_spawn_count was renamed mat_wave_size; the test still queried the old key (returning 0.0). Point it at the current param + its registered range. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:19:19 +03:00
richard	f02185e859	Fix pre-existing lint errors blocking the new CI gate A too-long line in console.gd and trailing whitespace in matador_spawn.gd predate this branch but fail gdlint, which the new CI runs on every push. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:18:21 +03:00
richard	70274f1773	Route the bull's hits through the typed DamageEvent pipeline Hitbox now builds a DamageEvent (cause + hit position + shaped knock-up) and calls the bull's new receive_damage(), instead of two stringly Object.call()s. receive_damage adapts over the existing pip/knock-up logic so behaviour is identical -- the characterization test drives both the string and typed paths and asserts the same outcomes. Wire fx/damage/harness tests into run_tests.sh + CLAUDE.md. All hitbox guard tests green (stab, bear hitbox, ram, charge). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:17:04 +03:00
richard	973db7d8b8	Add scene-authored FX effect library and Fx autoload Replace code-buried CPUParticles with inspector-editable effect scenes fired through one Fx autoload: code names the effect (Fx.spawn(&"blood_burst", xform)), the .tscn owns the look. Ships four placeholder effects (blood_burst, slam_dust, spark, hit_flash) seeded from the old code params, a self-freeing one_shot_effect root helper, a live preview gallery, and an FX style guide for Siim. CPUParticles only (mobile GLES3 constraint). Existing call sites untouched -- migrated later. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-09-05 00:13:43 +03:00
richard	1ea7f7a744	Add characterization test locking the bull's damage reception Pins take_sword_hit / apply_knock_up behaviour (pip loss, i-frames, single tagged death, upward-only knock-up) before WS2 reroutes them through DamageEvent. 12/12 headless. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:13:23 +03:00
richard	64fabb688f	Add typed DamageEvent contract for the unified hit pipeline The single payload every attack will route through, replacing the stringly Object.call(&"take_sword_hit", "gored") paths. Standalone for now; the per-actor slices wire hitbox.gd and the bull/matador/bear receivers onto it. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:09:35 +03:00
richard	9122a601d0	Wire harness self-test into run_tests.sh Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:07:46 +03:00
richard	a6f938a0da	Add CI workflow and reusable test-harness foundation Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-09-05 00:07:03 +03:00
richard	994ce3be73	Add headless UI-layout robustness test Asserts computed Control geometry instead of pixels: HUD/menu stay on-screen, text fits its box, tap targets >=44px, and the options scroll can reach its overflow -- across five resolutions plus a +40% pseudo-locale pass. Wired into run_tests.sh and the CLAUDE.md test list. 16/16 pass headless. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:01:06 +03:00
richard	39aacc3c87	Remove editor autosave cruft and orphan scenes Delete 17 tracked .tmp editor autosaves and three verified-unreferenced orphans (Assets/bear_level.tscn, Assets/matador_2.tscn, matador_2.gd), and gitignore .tmp so they never return. The real Assets/bear_level_arena.glb is kept — it still backs levels/bear_level.tscn. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-05 00:01:06 +03:00
richard	400ae24f92	Remove the persistent blood-decal system Strip only the floor/wall blood-splat decals added in `981ebf1`, keeping the older death-spray, spear-wound spurt, and "Blood & Gore" toggle: - Delete blood_decals.gd + shader, the Gore autoload (gore.gd), and tests/blood_decals_test.gd - Drop the Gore autoload and the Blood DP section - Remove all Gore.splat() call sites (matador.gd, bear.gd, player.gd); the _blood_burst spray and _spawn_blood spurt stay - game_shell no longer spawns a per-level decal pool - Update level_switch test + run_tests.sh accordingly Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CmG3mQGVXZUPDVapmdbWZ1	2026-09-04 22:41:00 +03:00
richard	79ea5bb2be	Bump version to 0.4.0 The in-game version banner (GameVersion.full) reads config/version from project.godot; it had lagged at 0.2.0 behind the 0.3.0 tag. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EznnY8rH2dXhtono1kwsXg	2026-09-04 14:19:19 +03:00
richard	981ebf1910	Add blood decals, gore, mobile HUD, web start gate + touch/perf tests Remove tools/fstest.html scratch page used to probe browser fullscreen/orientation APIs. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EznnY8rH2dXhtono1kwsXg	2026-09-04 14:07:57 +03:00
siim	01d6ecf475	go to bear level fix and vibration of controller when gate is opening	2026-09-03 18:20:19 +03:00
siim	931ddf0eeb	can turn "gamepad_vibration" on and off in debug mode	2026-09-03 18:04:58 +03:00
siim	50073b2574	controller vibrate when taking damage	2026-09-03 17:53:44 +03:00
siim	07f8a71f2c	torches light animation	2026-09-03 07:53:55 +03:00
richard	34dc5b026e	Lobby barrel-smash reward + roll/slam barrel destruction Bull's boulder roll now homes on and ploughs through lobby barrels, and the slam shockwave bursts them within its radius. HUD tallies barrels on load and fires a confetti "WOooOoW!" + two gold bonus HP pips when the last one breaks; gates open from run state as fights are cleared. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-09-03 01:38:57 +03:00
richard	5c1e881a53	Combat overhaul: charge/gore, bear ram, matador taunt reactions Bull charge damage: - Tunnel-proof swept detection (prev→now segment) for matador gore and bear ram, so a 66 m/s dash no longer skips clean over the thin HitArea. - Horns-first cone (bull_gore_arc): running into an enemy only wounds it when charging roughly at it, not a sideways brush. - Dash is a committed lunge: bypasses the horns cone AND the survival roll, so a dash connect is a guaranteed kill. Cruise charges keep a speed-scaled roll (mat_charge_pierce). Roll ability defers to its own pop (is_rolling guard). Bear: - Horns-first swept ram detection (edge-triggered: one charge = one wound); a tunnelling or point-blank charge now lands where body_entered wouldn't. - Overhead smash lane extends faster (0.1s) and further (20 m). - Leap slam launches the bull from anywhere in the circle (ring_frac 0). - Removed stray-quote syntax errors that broke the script. Matador: - Collider-driven stab (BladeHitbox) with recovery beat + taunt-after-hit so it stops machine-gunning the bull. - A taunting matador answers a charge: spear from range, sword up close. Spear projectile masks the BULL layer so throws connect. Tests: matador_charge/stab/spear/taunt_react, bear_ram/hitbox/fx (+ unified _fake_bull stand-in). Trimmed verbose comments. Note: bear claw-emitter/death work is still WIP (3 bear_boss_test failures). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-09-03 01:01:42 +03:00
siim	4efc6763f0	lobby little tweak	2026-09-01 21:34:02 +03:00
siim	76d4fee33c	Lobby level gates trigger areas	2026-09-01 21:22:16 +03:00
siim	271be0b26b	+ torches	2026-09-01 08:58:56 +03:00
siim	98c6f1285a	underground_lobby	2026-08-31 21:52:13 +03:00
siim	4d66df8c7e	bear long range slam. and not rotating while attacking animore. but dash and movement damage not working now	2026-08-29 09:30:03 +03:00
siim	41f18cb5d6	bear fx v2	2026-08-28 21:43:59 +03:00
siim	6b6a926715	bear_fx	2026-08-28 20:23:13 +03:00
siim	dae7ec06da	barrel materials	2026-08-28 19:43:09 +03:00
siim	1eb06876e9	breakable barrels	2026-08-28 19:02:19 +03:00
richard	1021a07b04	Put dead matadors on a corpse collision layer A killed matador's ragdoll shared the WORLD layer with the bull, so the bull collided with the bodies and spazzed out on them. Give corpses a dedicated CORPSE layer masked to itself, and tag the ground/walls with CORPSE too (at level load, so it also reaches colliders baked into the instanced GLB arenas). The corpse still rests on the arena, but the bull — which only masks WORLD — passes straight through the bodies. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-08-27 23:27:10 +03:00
richard	c365f76d80	Merge remote-tracking branch 'origin/main'	2026-08-27 21:34:23 +03:00
richard	32ac46f840	lobby cam	2026-08-27 21:34:18 +03:00
siim	bd10d1789b	bear max hp 30	2026-08-27 21:30:48 +03:00
siim	170d8ff3f1	siim timmimised väiksed	2026-08-27 21:15:36 +03:00
siim	550bf2c5ad	adjustable wave size with debug parameter "mat_wave_size"	2026-08-27 20:36:00 +03:00
siim	02f3e283de	landing. don't bounce!	2026-08-27 08:30:03 +03:00
siim	9123574947	crowd billbord placement + mat sword run fix	2026-08-26 22:32:30 +03:00
siim	aadf59d2d0	lobby collisions	2026-08-26 21:09:41 +03:00
richard	d57c3dc2a2	Merge remote-tracking branch 'origin/main'	2026-08-26 20:38:14 +03:00
richard	09ae6bfbf4	lobby level	2026-08-26 20:38:07 +03:00
richard	40c1b8e680	debug param save works, bull/bear hitbox	2026-08-26 20:37:50 +03:00
siim	a1c77fed5e	Update debug_params.gd	2026-08-26 20:02:23 +03:00
siim	1a8af92d88	matador attack fix	2026-08-26 19:53:43 +03:00
siim	8166a6c18e	Merge branch 'main' of https://git.richard.work/siim/Bullosseum	2026-08-26 19:41:35 +03:00
siim	46d6dda325	capsule	2026-08-26 19:41:23 +03:00
richard	fc9348551d	fix sword holster	2026-08-26 19:18:52 +03:00
richard	c4a19c7443	crowd markers, unsheathed sword correct	2026-08-26 19:13:39 +03:00
siim	95c4c0ddf9	BEAR ARENA UPDATE	2026-08-26 19:12:27 +03:00
siim	6a4f104655	bear arena model updeit	2026-08-26 18:30:09 +03:00
siim	d4b67888d7	controller zoom with right stick	2026-08-26 18:12:12 +03:00
siim	b177e0aee3	matadors dont come inside the player anymore with sword attack. also got rid of matador.gd dublicate.. that i made for testing animation	2026-08-26 08:39:40 +03:00
siim	2a6f4c0f7b	bear_FX	2026-08-25 21:58:43 +03:00
siim	32d0c58f5c	bear_ Call method track testing with spears	2026-08-25 08:49:44 +03:00
siim	251002ea7c	bull and bear flashing red when take damage	2026-08-25 08:04:39 +03:00
siim	986496097f	arena cleanup	2026-08-24 18:45:03 +03:00
siim	d976deeb6a	arena cleanup+tex modification	2026-08-24 18:41:34 +03:00
siim	d632670092	+death animation bear	2026-08-24 08:36:48 +03:00
siim	e1899e49f4	level lobby	2026-08-23 23:40:28 +03:00
siim	6f5f9e6bba	ps1 filter tuun	2026-08-23 22:26:58 +03:00
siim	91cd027a98	adj	2026-08-23 22:05:57 +03:00
siim	ef2fb24969	cooldowns increase	2026-08-23 21:39:19 +03:00
siim	4c75776c70	debug_param_cooldown adjusts	2026-08-23 21:28:19 +03:00
siim	7688084b7e	spear update	2026-08-23 21:15:25 +03:00
richard	ccc92f201f	mobile support tweaks	2026-08-23 20:32:52 +03:00
richard	008650a87e	Merge remote-tracking branch 'origin/main'	2026-08-23 17:34:05 +03:00
richard	b9e3147519	Bear, level selector (to be removed), new matador spawn, new bear level, saving config updates source files	2026-08-23 17:33:47 +03:00
richard	cdba320cbc	bear	2026-08-23 17:33:32 +03:00
richard	ee7b1617c1	Bear, level selector (to be removed), new matador spawn, new bear level, saving config updates source files	2026-08-23 17:33:15 +03:00
richard	d749485126	Map screen version	2026-08-23 13:16:04 +03:00
richard	45427b7070	Merge remote-tracking branch 'origin/main'	2026-08-23 12:37:35 +03:00
richard	d514435dd8	touch controls and hud	2026-08-23 12:37:30 +03:00
siim	3eb9fa50f3	+bear boss	2026-08-23 11:18:45 +03:00
siim	aee900c009	bear boss, aga broken	2026-08-21 18:23:30 +03:00
siim	4cf714f516	Update spear.glb	2026-08-17 23:49:29 +03:00
siim	b78736a1f4	icon update	2026-08-10 04:43:48 +03:00
siim	212263c858	credits tuun	2026-08-10 03:53:17 +03:00
siim	8c4eeb0861	cooldowns?	2026-08-10 03:30:53 +03:00
siim	95def2d527	loading text + fullscreen default	2026-08-10 01:04:57 +03:00
siim	9a43a9ff8b	icon	2026-08-09 23:58:01 +03:00
siim	7238cbf49e	death anim speed .8	2026-08-09 23:19:23 +03:00
siim	44c667f097	collision scale	2026-08-09 23:15:43 +03:00
siim	3cd347d420	walk anim, death anim ja loading screen	2026-08-09 23:05:55 +03:00
richard	6414b2e7cc	uids	2026-08-09 19:40:39 +03:00