Do not assume a player has already spawned on a map when figuring out…

… spawn locations.

GitOrigin-RevId: 0fcede83a96e0aca0317ba6c0afbc83fe69d0283

athena/map/Unit.tsx

@@ -490,14 +490,14 @@ export default class Unit extends Entity {
     );
   }
 
-  canCapture(player: Player) {
+  canCapture(player: Player | null) {
     return (
       this.info.hasAbility(Ability.Capture) ||
       (this.info === Sniper &&
         this.isLeader() &&
         !this.isUnfolded() &&
-        player.skills.has(Skill.UnitAbilitySniperImmediateAction)) ||
-      (this.info === Dragon && player.skills.has(Skill.DragonSaboteur))
+        player?.skills.has(Skill.UnitAbilitySniperImmediateAction)) ||
+      (this.info === Dragon && player?.skills.has(Skill.DragonSaboteur))
     );
   }
 

dionysus/lib/__tests__/estimateClosestTarget.test.tsx

@@ -0,0 +1,26 @@
+import { Sniper } from '@deities/athena/info/Unit.tsx';
+import withModifiers from '@deities/athena/lib/withModifiers.tsx';
+import vec from '@deities/athena/map/vec.tsx';
+import MapData from '@deities/athena/MapData.tsx';
+import { expect, test } from 'vitest';
+import estimateClosestTarget from '../estimateClosestTarget.tsx';
+
+const map = withModifiers(
+  MapData.createMap({
+    map: [
+      1, 1, 1, 3, 2, 1, 1, 1, 3, 1, 1, 2, 3, 1, 3, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1,
+    ],
+    size: { height: 5, width: 5 },
+  }),
+);
+
+test('estimateClosestTarget should not require a player to be present on the map', () => {
+  const [target] = estimateClosestTarget(
+    map,
+    Sniper.create(3, { name: -1 }),
+    vec(1, 1),
+    [vec(5, 1), vec(1, 5)],
+    true,
+  );
+  expect(target?.vector).toEqual(vec(1, 5));
+});

dionysus/lib/estimateClosestTarget.tsx

@@ -56,7 +56,7 @@ const maybeOptimizeTargets = (
     return targets;
   }
 
-  if (unit.canCapture(map.getPlayer(unit))) {
+  if (unit.canCapture(map.maybeGetPlayer(unit) || null)) {
     const sortedTargets = sortBy(
       targets.map((vector) => radius.get(vector)).filter(isPresent),
       minByCost,

dionysus/lib/shouldCaptureBuilding.tsx

@@ -18,7 +18,7 @@ export default function shouldCaptureBuilding(
     return (
       !maybeUnit ||
       (!map.matchesPlayer(maybeUnit, building) &&
-        !maybeUnit.canCapture(map.getPlayer(maybeUnit)))
+        !maybeUnit.canCapture(map.maybeGetPlayer(maybeUnit) || null))
     );
   }