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

Harden sortie item save recovery

Browse Source
This commit is contained in:
Wickedness
2026-07-05 09:36:25 +09:00
parent 2256669719
commit 7185566b5d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,9 @@ try {
sortieFormationAssignments: 'front',
sortieItemAssignments: {
'liu-bei': { bean: '2', wine: -1 },
'guan-yu': 'broken'
'guan-yu': '2',
'zhang-fei': ['bean', '2'],
'': { bean: 4 }
},
battleHistory: []
})
@@ -109,6 +111,9 @@ try {
malformed.inventory.wine === undefined &&
malformed.sortieItemAssignments['liu-bei']?.bean === 2 &&
malformed.sortieItemAssignments['liu-bei']?.wine === undefined &&
malformed.sortieItemAssignments['guan-yu'] === undefined &&
malformed.sortieItemAssignments['zhang-fei'] === undefined &&
Object.keys(malformed.sortieItemAssignments).length === 1 &&
Object.keys(malformed.sortieFormationAssignments).length === 0,
`Expected malformed inventory and sortie assignments to normalize: ${JSON.stringify(malformed)}`
);
@@ -258,7 +263,7 @@ try {
const fallback = loadCampaignState();
assert(fallback.step === 'second-camp' && fallback.activeSaveSlot === 2, `Expected valid slotted save fallback: ${JSON.stringify(fallback)}`);
console.log('Verified campaign save normalization, malformed-field/bond/history-detail recovery, unknown-step/report/history recovery, unsupported-version rejection, and slotted fallback.');
console.log('Verified campaign save normalization, malformed-field/bond/sortie-item/history-detail recovery, unknown-step/report/history recovery, unsupported-version rejection, and slotted fallback.');
} finally {
await server.close();
}

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

@@ -991,17 +991,17 @@ function normalizeReserveTrainingSnapshot(value: unknown): CampaignReserveTraini
};
}
function normalizeSortieItemAssignments(assignments?: CampaignSortieItemAssignments) {
function normalizeSortieItemAssignments(assignments?: Record<string, unknown>) {
return Object.entries(assignments ?? {}).reduce<CampaignSortieItemAssignments>((next, [unitId, stocks]) => {
const unitStocks = Object.entries(stocks ?? {}).reduce<Record<string, number>>((nextStocks, [itemId, amount]) => {
const normalizedAmount = Math.floor(Number(amount));
const unitStocks = Object.entries(recordOrEmpty(stocks)).reduce<Record<string, number>>((nextStocks, [itemId, amount]) => {
const normalizedAmount = normalizeNonNegativeInteger(amount);
if (itemId && normalizedAmount > 0) {
nextStocks[itemId] = normalizedAmount;
}
return nextStocks;
}, {});
if (Object.keys(unitStocks).length > 0) {
if (unitId && Object.keys(unitStocks).length > 0) {
next[unitId] = unitStocks;
}
return next;