Fix Commanders showing the wrong attack preview.

GitOrigin-RevId: c95173a8ef90db0a65d9922e851312522edf34af
nkzw-tech · Nov 15, 2024 · 343a8ba · 343a8ba
1 parent ff2257f
commit 343a8ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/athena/lib/getAttackStatusEffect.tsx b/athena/lib/getAttackStatusEffect.tsx
@@ -29,8 +29,7 @@ export default function getAttackStatusEffect(
     for (const adjacent of vector.adjacent()) {
       const unit = map.units.get(adjacent);
       if (
-        unit &&
-        unit.info.hasAbility(Ability.Morale) &&
+        unit?.info.hasAbility(Ability.Morale) &&
         map.matchesPlayer(unit, player)
       ) {
         unitEffect += MoraleStatusEffect;

diff --git a/hera/behavior/attack/AttackSelector.tsx b/hera/behavior/attack/AttackSelector.tsx
@@ -102,12 +102,18 @@ export default function AttackSelector({
     if (entities.building || entities.unit) {
       const isShortRange = selectedUnit.info.isShortRange();
       const targetPosition = origin || selectedPosition;
+      const futureMap =
+        targetPosition === selectedPosition
+          ? map
+          : map.copy({
+              units: map.units.delete(selectedPosition),
+            });
       const unitDamage =
         entities.unit &&
         getDamageInformation(
           selectedUnit,
           entities.unit,
-          map,
+          futureMap,
           targetPosition,
           position,
         );
@@ -116,7 +122,7 @@ export default function AttackSelector({
         getDamageInformation(
           selectedUnit,
           entities.building,
-          map,
+          futureMap,
           targetPosition,
           position,
         );