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

Clamp campaign objective target markers

Browse Source
This commit is contained in:
Wickedness
2026-07-05 14:22:22 +09:00
parent e4ff46e6e0
commit c702bfdfb0
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/verify-campaign-save-normalization.mjs
View File

@@ -768,7 +768,15 @@ try {
status: 'lost',
detail: 12,
rewardGold: '80',
targetTile: { x: '4', y: '5', radius: '2' }
targetTile: { x: '4', y: '5', radius: '200' }
},
{
id: 'broken-target',
label: 'Broken target',
achieved: false,
detail: 'Bad target tile',
rewardGold: 0,
targetTile: { x: '-1', y: '5', radius: '2' }
},
'broken-objective',
...Array.from({ length: 30 }, (_, index) => ({
@@ -879,9 +887,12 @@ try {
`Expected stale latestBattleId to recover to the latest valid settlement: ${JSON.stringify(malformedHistory)}`
);
assert(
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives.length === 24 &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives.length === 24 &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives[0].rewardGold === 80 &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives[0].targetTile?.x === 4 &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives[0].targetTile?.radius === 99 &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives[1].id === 'broken-target' &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives[1].targetTile === undefined &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.objectives[0].status === undefined &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.units.length === 1 &&
malformedHistory.battleHistory['first-battle-zhuo-commandery']?.units[0].level === 4 &&

5
src/game/state/campaignState.ts
View File

@@ -277,6 +277,7 @@ const maxCampaignReserveTrainingEntries = 96;
const maxCampaignSortieAssignmentUnits = 96;
const maxCampaignDisplayTextLength = 180;
const maxCampaignNumericValue = 999999;
const maxCampaignObjectiveTargetRadius = 99;
export const campaignReserveTrainingFocusDefinitions: CampaignReserveTrainingFocusDefinition[] = [
{
@@ -1129,11 +1130,11 @@ function normalizeObjectiveTargetTile(value: unknown): BattleObjectiveSnapshot['
const x = Math.floor(Number(value.x));
const y = Math.floor(Number(value.y));
if (!Number.isFinite(x) || !Number.isFinite(y)) {
if (!Number.isFinite(x) || !Number.isFinite(y) || x < 0 || y < 0) {
return undefined;
}
const radius = normalizeNonNegativeInteger(value.radius);
const radius = Math.min(normalizeNonNegativeInteger(value.radius), maxCampaignObjectiveTargetRadius);
return radius > 0 ? { x, y, radius } : { x, y };
}