Clamp campaign save growth values

This commit is contained in:
2026-07-05 13:09:26 +09:00
parent 62a17274ff
commit 8d306587fc
2 changed files with 87 additions and 27 deletions

View File

@@ -948,6 +948,23 @@ function normalizeNonNegativeInteger(value: unknown) {
return Number.isFinite(numeric) && numeric > 0 ? numeric : 0;
}
function normalizeCharacterLevel(value: unknown) {
return Math.min(99, Math.max(1, normalizeNonNegativeInteger(value)));
}
function normalizeCharacterExpForLevel(level: number, value: unknown) {
const exp = normalizeNonNegativeInteger(value);
return Math.min(exp, level >= 99 ? 100 : 99);
}
function normalizeBondLevel(value: unknown) {
return Math.min(100, normalizeNonNegativeInteger(value));
}
function normalizeBondExp(value: unknown) {
return Math.min(99, normalizeNonNegativeInteger(value));
}
function normalizeCampaignTimestamp(value: unknown) {
if (typeof value !== 'string' || value.length === 0) {
return undefined;
@@ -1119,11 +1136,12 @@ function normalizeCampaignUnitProgressSnapshot(value: unknown): CampaignUnitProg
const hp = normalizeNonNegativeInteger(value.hp);
const maxHp = Math.max(hp, normalizeNonNegativeInteger(value.maxHp));
const level = normalizeCharacterLevel(value.level);
return {
unitId,
name,
level: Math.max(1, normalizeNonNegativeInteger(value.level)),
exp: normalizeNonNegativeInteger(value.exp),
level,
exp: normalizeCharacterExpForLevel(level, value.exp),
hp,
maxHp: Math.max(1, maxHp),
equipment: normalizeEquipmentSet(value.equipment)
@@ -1141,11 +1159,12 @@ function normalizeCampaignBondProgressSnapshot(value: unknown): CampaignBondProg
return undefined;
}
const level = normalizeBondLevel(value.level);
return {
id,
title,
level: normalizeNonNegativeInteger(value.level),
exp: normalizeNonNegativeInteger(value.exp),
level,
exp: normalizeBondExp(value.exp),
battleExp: normalizeNonNegativeInteger(value.battleExp)
};
}
@@ -1162,6 +1181,7 @@ function normalizeReserveTrainingSnapshot(value: unknown): CampaignReserveTraini
return undefined;
}
const level = normalizeCharacterLevel(value.level);
return {
unitId,
name,
@@ -1170,8 +1190,8 @@ function normalizeReserveTrainingSnapshot(value: unknown): CampaignReserveTraini
bondExpGained: normalizeNonNegativeInteger(value.bondExpGained),
focusId: normalizeReserveTrainingFocusId(typeof value.focusId === 'string' ? value.focusId : undefined),
...(focusLabel ? { focusLabel } : {}),
level: normalizeNonNegativeInteger(value.level),
exp: normalizeNonNegativeInteger(value.exp)
level,
exp: normalizeCharacterExpForLevel(level, value.exp)
};
}
@@ -1274,14 +1294,15 @@ function normalizeUnitDataSnapshot(value: unknown): UnitData | undefined {
const stats = recordOrEmpty(value.stats);
const hp = normalizeNonNegativeInteger(value.hp);
const maxHp = Math.max(hp, normalizeNonNegativeInteger(value.maxHp));
const level = normalizeCharacterLevel(value.level);
return {
id,
name,
faction: value.faction,
className: normalizeDisplayString(value.className),
classKey: normalizeUnitClassKey(value.classKey),
level: Math.max(1, normalizeNonNegativeInteger(value.level)),
exp: normalizeNonNegativeInteger(value.exp),
level,
exp: normalizeCharacterExpForLevel(level, value.exp),
hp,
maxHp: Math.max(1, maxHp),
attack: normalizeNonNegativeInteger(value.attack),
@@ -1311,10 +1332,11 @@ function normalizeEquipmentSet(value: unknown): UnitData['equipment'] {
typeof state.itemId === 'string' && itemCatalog[state.itemId]?.slot === slot
? state.itemId
: defaultEquipmentBySlot[slot];
const level = normalizeEquipmentLevel(state.level);
equipment[slot] = {
itemId,
level: normalizeEquipmentLevel(state.level),
exp: normalizeNonNegativeInteger(state.exp)
level,
exp: normalizeEquipmentExpForLevel(level, state.exp)
};
return equipment;
}, {} as UnitData['equipment']);
@@ -1325,6 +1347,12 @@ function normalizeEquipmentLevel(value: unknown) {
return Math.min(9, Math.max(1, level));
}
function normalizeEquipmentExpForLevel(level: number, value: unknown) {
const exp = normalizeNonNegativeInteger(value);
const next = equipmentExpToNext(level);
return Math.min(exp, level >= 9 ? next : Math.max(0, next - 1));
}
function normalizeCampMvpSnapshot(value: unknown): CampMvpSnapshot | undefined {
if (!isPlainObject(value)) {
return undefined;
@@ -1356,13 +1384,14 @@ function normalizeCampBondSnapshot(value: unknown): CampBondSnapshot | undefined
return undefined;
}
const level = normalizeBondLevel(value.level);
return {
...(value as CampBondSnapshot),
id,
title,
unitIds: [unitIds[0], unitIds[1]] as [string, string],
level: normalizeNonNegativeInteger(value.level),
exp: normalizeNonNegativeInteger(value.exp),
level,
exp: normalizeBondExp(value.exp),
battleExp: normalizeNonNegativeInteger(value.battleExp)
};
}