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

Normalize sortie supply assignments

Browse Source
This commit is contained in:
Wickedness
2026-07-05 10:14:24 +09:00
parent 23eabd9ca6
commit a1f925c1ca
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ try {
selectedSortieUnitIds: { corrupted: true },
sortieFormationAssignments: 'front',
sortieItemAssignments: {
'liu-bei': { bean: '2', wine: -1 },
'liu-bei': { bean: '5', wine: -1, salve: '1', stone: '9' },
'guan-yu': '2',
'zhang-fei': ['bean', '2'],
'': { bean: 4 }
@@ -110,6 +110,8 @@ try {
malformed.inventory.bean === 3 &&
malformed.inventory.wine === undefined &&
malformed.sortieItemAssignments['liu-bei']?.bean === 2 &&
malformed.sortieItemAssignments['liu-bei']?.salve === 1 &&
malformed.sortieItemAssignments['liu-bei']?.stone === undefined &&
malformed.sortieItemAssignments['liu-bei']?.wine === undefined &&
malformed.sortieItemAssignments['guan-yu'] === undefined &&
malformed.sortieItemAssignments['zhang-fei'] === undefined &&

15
src/game/scenes/BattleScene.ts
View File

@@ -47,6 +47,7 @@ import {
listCampaignSaveSlots,
loadCampaignState,
markCampaignStep,
normalizeCampaignSortieItemAssignments,
saveCampaignState,
setFirstBattleReport,
type CampaignRewardSnapshot,
@@ -3458,19 +3459,7 @@ export class BattleScene extends Phaser.Scene {
}
private normalizeLaunchSortieItemAssignments(assignments?: CampaignSortieItemAssignments) {
return Object.entries(assignments ?? {}).reduce<CampaignSortieItemAssignments>((next, [unitId, stocks]) => {
const unitStocks = Object.entries(stocks ?? {}).reduce<Record<string, number>>((nextStocks, [itemId, count]) => {
const normalizedCount = Math.floor(Number(count));
if (itemId && normalizedCount > 0) {
nextStocks[itemId] = normalizedCount;
}
return nextStocks;
}, {});
if (Object.keys(unitStocks).length > 0) {
next[unitId] = unitStocks;
}
return next;
}, {});
return normalizeCampaignSortieItemAssignments(assignments);
}
private effectiveSortieUnitIds(campaign?: CampaignState) {

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

@@ -254,6 +254,12 @@ const defaultEquipmentBySlot: Record<EquipmentSlot, string> = {
accessory: 'grain-pouch'
};
const sortieSupplyMaxByUsableId: Record<string, number> = {
bean: 2,
wine: 1,
salve: 1
};
const campaignInventoryCaps: Record<string, number> = {
['\uCF69']: 120,
['\uC0C1\uCC98\uC57D']: 80,
@@ -826,7 +832,7 @@ function normalizeCampaignState(state: Partial<CampaignState>): CampaignState {
normalized.selectedSortieUnitIds = uniqueStrings(normalized.selectedSortieUnitIds)
.filter((unitId) => !sortieUnitFilter || sortieUnitFilter.has(unitId));
normalized.sortieFormationAssignments = normalizeSortieFormationAssignments(recordOrEmpty(normalized.sortieFormationAssignments), sortieUnitFilter);
normalized.sortieItemAssignments = normalizeSortieItemAssignments(recordOrEmpty(normalized.sortieItemAssignments), sortieUnitFilter);
normalized.sortieItemAssignments = normalizeCampaignSortieItemAssignments(recordOrEmpty(normalized.sortieItemAssignments), sortieUnitFilter);
normalized.reserveTrainingFocus = normalizeReserveTrainingFocusId(normalized.reserveTrainingFocus);
normalized.battleHistory = normalizeBattleHistory(normalized.battleHistory);
normalized.latestBattleId = normalizeLatestBattleId(normalized.latestBattleId, normalized.battleHistory);
@@ -1022,16 +1028,20 @@ function normalizeReserveTrainingSnapshot(value: unknown): CampaignReserveTraini
};
}
function normalizeSortieItemAssignments(assignments?: Record<string, unknown>, allowedUnitIds?: Set<string>) {
export function normalizeCampaignSortieItemAssignments(assignments?: Record<string, unknown>, allowedUnitIds?: Set<string>) {
return Object.entries(assignments ?? {}).reduce<CampaignSortieItemAssignments>((next, [unitId, stocks]) => {
if (!unitId || (allowedUnitIds && !allowedUnitIds.has(unitId))) {
return next;
}
const unitStocks = Object.entries(recordOrEmpty(stocks)).reduce<Record<string, number>>((nextStocks, [itemId, amount]) => {
const maxPerUnit = sortieSupplyMaxByUsableId[itemId];
if (!maxPerUnit) {
return nextStocks;
}
const normalizedAmount = normalizeNonNegativeInteger(amount);
if (itemId && normalizedAmount > 0) {
nextStocks[itemId] = normalizedAmount;
nextStocks[itemId] = Math.min(maxPerUnit, normalizedAmount);
}
return nextStocks;
}, {});