The lobby hub replaced the between-fights map, leaving the whole map
subsystem unused. Remove it:
- Delete MapScreen.tscn + map_screen.gd (the dead screen) and map_node.gd
(the MapNode class).
- Strip map generation + navigation from run_state.gd (~90 lines:
_generate_map/_link_rows/reachable/select_node/node_at/current_node/
run_complete/complete_current_level, plus map/player_row/col/pending_row/col).
ensure_run() now guards on a _run_active flag instead of the map array, so
the shell reloading for each fight still can't wipe the run in progress.
- Simplify active_level() to the lobby flow (override -> lobby -> gate -> arena).
- Drop the now-unread LevelDef.color / is_boss fields and the _make_level args.
- Remove the map test from logic_test.gd.
Live flow unchanged (lobby gates via choose_level, wins via return_to_lobby).
Full headless suite green; menu + shell boot into the lobby clean.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FBbGXbzg3SD6ZBSadPPF5H
Group all raw art by role under art/ (characters, levels, weapons, fx,
anim, textures, ui, icons, fonts, hdri, materials), matching the earlier
code reorg. Files are snake_case; asset uids are preserved so uid:// refs
still resolve, and every res:// path reference is rewritten across scenes,
scripts and project.godot.
- Move the used assets out of Assets/ Animations/ fonts/ HUD/ HDRI/
Materials/ into art/; remove those dirs.
- Materials snake_cased: barrel_metal, barrel_wood, bear_claw_fx, fire.
- Delete unreferenced assets: alternate models, empty stub scripts,
superseded BEAR_*.tres, marketing/spare PNGs, a spare font weight and
the orphan M_Barrel_wood.gdshader.
- Blender: drop .blend auto-backups and matador_v01/v02 (+ stale v02 fbx);
keep matador_v03 and repoint create_matador_anims.py to it. .gitignore
now blocks all Blender/*.blend[0-9] backups.
- GLB Extract-Textures siblings (art/levels/*.png) kept and tracked.
- Document the art/ layout in CLAUDE.md.
Headless suite green; menu and gameplay shell boot clean.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FBbGXbzg3SD6ZBSadPPF5H
Move the 40-odd root-level scripts and scenes into a tree that groups by role,
per the approved roadmap (WS2/WS3): actors/{player,matador,bear}, systems/{combat,
fx,input,debug,render,crowd,config}, ui/, props/ (was tscn_s/). Rename the shell
scene.tscn -> levels/game_shell.tscn and every PascalCase scene to snake_case
(Player.tscn -> player.tscn, MainMenu.tscn -> main_menu.tscn, etc.) so the
case-insensitive web/macOS filesystems can't alias two files together.
Done as a scripted move: each file travels with its .uid; every quoted res:// path
across scenes, scripts, .tres, and project.godot's 9 autoloads is rewritten; the
.godot uid/class cache is rebuilt from scratch. Scenes still resolve by uid, so the
rewrite is belt-and-suspenders. Lint globs (run_tests.sh + both CI workflows) now
walk the new dirs; an orphan animation_tree.gd.uid and 7 pre-existing trailing-
whitespace lints (barrel/torch, never covered by the old root-only glob) are cleaned.
Full suite green on both sides. Asset consolidation (Assets/Animations/fonts ->
art/) is deferred — moving imported .glb/.png/.ttf is safer done in the editor.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017KoYBYQgRyY1zDHXMsXY3V
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
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>
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>
richard
siim