bastian/ashen-realms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web/src/app/shared/monster-artwork.spec.ts
View File

@@ -31,10 +31,10 @@ describe('monsterCutoutPath', () => {
describe('monsterIconPath', () => {
it('returns the medallion icon for a known monster key', () => {
expect(monsterIconPath('ash-rat')).toBe('/images/monsters/icons/ash-rat-128.png');
expect(monsterIconPath('road-bandit')).toBe('/images/monsters/icons/road-bandit-128.png');
expect(monsterIconPath('ash-rat')).toBe('/images/combat/icons/ash-rat-128.png');
expect(monsterIconPath('road-bandit')).toBe('/images/combat/icons/road-bandit-128.png');
expect(monsterIconPath('charred-looter')).toBe(
'/images/monsters/icons/charred-looter-128.png',
'/images/combat/icons/charred-looter-128.png',
);
});