Reject overlapping live battle save units

2026-07-05 13:33:25 +09:00
parent ad7e80b58f
commit 4931cb2cf7
2 changed files with 14 additions and 0 deletions
--- a/src/game/state/battleSaveState.ts
+++ b/src/game/state/battleSaveState.ts
@@ -219,6 +219,7 @@ function isAttackIntentArray(value: unknown, options: BattleSaveValidationOption

 function areSavedBattleUnitsValid(units: unknown[], options: BattleSaveValidationOptions) {
  const seenUnitIds = new Set<string>();
+  const seenLiveTileKeys = new Set<string>();

  for (const unit of units) {
    if (!isSavedBattleUnitState(unit, options) || seenUnitIds.has(unit.id)) {
@@ -226,6 +227,13 @@ function areSavedBattleUnitsValid(units: unknown[], options: BattleSaveValidatio
    }

    seenUnitIds.add(unit.id);
+    if (unit.hp > 0) {
+      const tileKey = `${unit.x}:${unit.y}`;
+      if (seenLiveTileKeys.has(tileKey)) {
+        return false;
+      }
+      seenLiveTileKeys.add(tileKey);
+    }
  }

  if (!options.validUnitIds) {