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:
@@ -131,7 +131,7 @@ export async function seedVisibleVerticalSlice(
|
||||
silverMin: 4,
|
||||
silverMax: 7,
|
||||
artworkPath: '/images/monsters/ash-rat.png',
|
||||
iconPath: '/images/monsters/icons/ash-rat-128.png',
|
||||
iconPath: '/images/combat/icons/ash-rat-128.png',
|
||||
lootTableId: ASH_RAT_LOOT_TABLE_ID,
|
||||
},
|
||||
{
|
||||
@@ -146,7 +146,7 @@ export async function seedVisibleVerticalSlice(
|
||||
silverMin: 5,
|
||||
silverMax: 9,
|
||||
artworkPath: '/images/monsters/wild-road-dog.png',
|
||||
iconPath: '/images/monsters/icons/wild-road-dog-128.png',
|
||||
iconPath: '/images/combat/icons/wild-road-dog-128.png',
|
||||
// Shares the beast table: both are scorched road animals that leave a
|
||||
// pelt behind. A table of its own waits for content that differs.
|
||||
lootTableId: ASH_RAT_LOOT_TABLE_ID,
|
||||
@@ -163,7 +163,7 @@ export async function seedVisibleVerticalSlice(
|
||||
silverMin: 9,
|
||||
silverMax: 15,
|
||||
artworkPath: '/images/monsters/road-bandit.png',
|
||||
iconPath: '/images/monsters/icons/road-bandit-128.png',
|
||||
iconPath: '/images/combat/icons/road-bandit-128.png',
|
||||
lootTableId: ROAD_BANDIT_LOOT_TABLE_ID,
|
||||
},
|
||||
{
|
||||
@@ -178,7 +178,7 @@ export async function seedVisibleVerticalSlice(
|
||||
silverMin: 12,
|
||||
silverMax: 19,
|
||||
artworkPath: '/images/monsters/charred-looter.png',
|
||||
iconPath: '/images/monsters/icons/charred-looter-128.png',
|
||||
iconPath: '/images/combat/icons/charred-looter-128.png',
|
||||
// Shares the raider table: same gear, taken from the same caravans.
|
||||
lootTableId: ROAD_BANDIT_LOOT_TABLE_ID,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user