Merge branch 'master' into worktree-local-location-view
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:
@@ -160,13 +160,13 @@ export function burnedRoadFixture(
|
||||
key: 'ash-rat',
|
||||
name: 'Aschenratte',
|
||||
level: 1,
|
||||
iconPath: '/images/monsters/icons/ash-rat-128.png',
|
||||
iconPath: '/images/combat/icons/ash-rat-128.png',
|
||||
},
|
||||
{
|
||||
key: 'road-bandit',
|
||||
name: 'Straßenräuber',
|
||||
level: 2,
|
||||
iconPath: '/images/monsters/icons/road-bandit-128.png',
|
||||
iconPath: '/images/combat/icons/road-bandit-128.png',
|
||||
},
|
||||
],
|
||||
rewardPreview: [
|
||||
|
||||
Reference in New Issue
Block a user