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

Browse Source

Brings in the First Loot slice. Resolved additively:

- MonsterDefinition keeps both the new iconPath and master's lootTableId.
- The seed keeps the four-monster pool and the local view content, and
  gives the two new monsters existing loot tables — the road dog shares
  the beast table, the charred looter the raider table.
- The local location view migration moves to 1788700000000 so it orders
  deterministically after the loot migration, which claimed the same
  timestamp.

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

...

This commit is contained in:

Bastian Wagner

2026-08-20 10:38:18 +02:00

parent 2664495ef4 624c47e5a6

commit c7e7e97252

77 changed files with 8315 additions and 32 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/items/ash-blade.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/ash-boots.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/ash-pelt.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/bandit-blade.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/bandit-hood.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/borderwatch-sigil.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/burned-captain-pendant.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/guardsman-legs.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/raider-gloves.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/reinforced-leather-jacket.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/small-healing-potion.png Normal file

Binary file not shown.

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

BIN

apps/web/public/images/items/worn-short-sword.png Normal file

Binary file not shown.

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