Wickedness/heros_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reject self targeting battle intents

Browse Source
This commit is contained in:
Wickedness
2026-07-05 13:27:20 +09:00
parent e9dbe404ff
commit 68960d6fd7
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/verify-battle-save-normalization.mjs
View File

@@ -52,6 +52,7 @@ try {
['too long battle log entry', { battleLog: ['x'.repeat(97)] }], ['too long battle log entry', { battleLog: ['x'.repeat(97)] }],
['invalid attackIntents', { attackIntents: [{ attackerId: 'liu-bei' }] }], ['invalid attackIntents', { attackIntents: [{ attackerId: 'liu-bei' }] }],
['unknown attack intent unit id', { attackIntents: [{ attackerId: 'liu-bei', targetId: 'ghost-unit' }] }], ['unknown attack intent unit id', { attackIntents: [{ attackerId: 'liu-bei', targetId: 'ghost-unit' }] }],
['self-targeting attack intent', { attackIntents: [{ attackerId: 'liu-bei', targetId: 'liu-bei' }] }],
['duplicate attack intent attacker id', { attackIntents: [{ attackerId: 'liu-bei', targetId: 'rebel-1' }, { attackerId: 'liu-bei', targetId: 'rebel-1' }] }], ['duplicate attack intent attacker id', { attackIntents: [{ attackerId: 'liu-bei', targetId: 'rebel-1' }, { attackerId: 'liu-bei', targetId: 'rebel-1' }] }],
['invalid units array', { units: {} }], ['invalid units array', { units: {} }],
['invalid unit exp threshold', { units: patchUnit(0, { exp: 100 }) }], ['invalid unit exp threshold', { units: patchUnit(0, { exp: 100 }) }],

1
src/game/state/battleSaveState.ts
View File

@@ -210,6 +210,7 @@ function isAttackIntentArray(value: unknown, options: BattleSaveValidationOption
isRecord(intent) && isRecord(intent) &&
typeof intent.attackerId === 'string' && typeof intent.attackerId === 'string' &&
typeof intent.targetId === 'string' && typeof intent.targetId === 'string' &&
intent.attackerId !== intent.targetId &&
isKnownUnitId(intent.attackerId, options) && isKnownUnitId(intent.attackerId, options) &&
isKnownUnitId(intent.targetId, options) isKnownUnitId(intent.targetId, options)
) )