Merge branch 'master' into worktree-local-location-view

Browse Source

Brings in the encounter-status feature (cleared/resumed hunt encounters)
and its own independent Verwilderter Straßenhund / Verkohlter Plünderer
assets. Both branches added the same two monsters at the same time;
resolved by keeping master's asset set as canonical (images/combat/icons/,
images/combat/sprites/) rather than maintaining a parallel copy under
images/monsters/icons/ — dropped that directory and pointed the seed's
MonsterDefinition.iconPath, the local-view test fixtures and the frontend
icon lookup at the existing combat/icons paths instead. Kept this
branch's COMBAT_MONSTER_SCALE entries for the two monsters, since master
never added them.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

...

This commit is contained in:

Bastian Wagner

2026-08-20 16:03:59 +02:00

parent 60e1734f59 ec91f3ac7b

commit c158260623

45 changed files with 889 additions and 88 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

apps/web/public/images/monsters/charred-looter.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 MiB After Width:  |  Height:  |  Size: 2.0 MiB

BIN

apps/web/public/images/monsters/icons/ash-rat-128.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

BIN

apps/web/public/images/monsters/icons/charred-looter-128.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 28 KiB

BIN

apps/web/public/images/monsters/icons/road-bandit-128.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.6 KiB

BIN

apps/web/public/images/monsters/icons/wild-road-dog-128.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 29 KiB

BIN

apps/web/public/images/monsters/runtime/charred-looter-560.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 538 KiB

BIN

apps/web/public/images/monsters/runtime/wild-road-dog-560.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 294 KiB

BIN

apps/web/public/images/monsters/wild-road-dog.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 MiB After Width:  |  Height:  |  Size: 2.2 MiB