openvibers/openvibe.games Commits

Scraplandia: a friendly warden or townsperson's prompt is their name, not 'LMB attack'; wildlife says 'LMB hunt', Rustjaw keeps '⚠ — LMB attack' (#122)

OP OpenVibers committed 24 days ago · d4492d7832 · 2 files, +6 −1

Changes

ddiff --git a/CHANGELOG.md b/CHANGELOG.md
iindex 714e9eb..e656fcf 100644
---- a/CHANGELOG.md
++++ b/CHANGELOG.md
@@@ -8,6 +8,9 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### Fixed
++- **"City Warden — LMB attack".** Looking at a friendly warden or townsperson now shows just their name, so the prompt
++ no longer invites you to hit them; a swing still lands. Wildlife says "LMB hunt", and Rustjaw thugs keep "⚠ — LMB
++ attack".
- **Scrap City drew every static on its own.** It is several hundred static meshes (walls, wall plates, buildings,
roofs, doors, stalls), and each textured one had a material of its own because its texture's scale follows its size.
That came to 165 draw calls in view and 298 shadow casters, with 525 materials.
ddiff --git a/apps/client/src/main.ts b/apps/client/src/main.ts
iindex c048237..f9ac631 100644
---- a/apps/client/src/main.ts
++++ b/apps/client/src/main.ts
@@@ -793,7 +793,9 @@ function promptFor(
if (target.kind === 'npc') {
const arch = content.npc(target.def ?? '')
const stance = arch ? content.faction(arch.faction)?.playerStance : undefined
-- return `${arch?.name ?? 'stranger'}${stance === 'hostile' ? ' ⚠' : ''} — LMB attack`
++ // Town folk and wardens are friendly: their name, not an invitation to hit them (a swing still lands).
++ if (stance === 'friendly') return arch?.name ?? 'stranger'
++ return `${arch?.name ?? 'stranger'}${stance === 'hostile' ? ' ⚠ — LMB attack' : ' — LMB hunt'}`
}
if (target.kind === 'prop') {
if (tool === 'rigging') {