@vibemancer/core 0.1.4 → 0.1.6

package/src/bots/duelist/03_Archmage.ts

@@ -1,15 +1,10 @@
-import {WizardFunction, MissileAIFunction} from '../../types.js';
+import type {FinalAction, MissileFunction} from '../../hooks/index.js';
+import {usePosition, useEnemy, useStatus, useBlinkCooldown, useHealth, useTick, useThreats, useProjectiles, useLastMissileConfig, useCastingSpell, useCastProgress, idle, move as moveAction, missile, shield, blink, cancel, getMissileContext, turnToward, flyStraight} from '../../hooks/index.js';
 import {angleTo} from '../../utils/angles.js';
 import {distanceTo} from '../../utils/distance.js';
-import {
-	ARENA_SIZE,
-	GCD_DURATION,
-	SHIELD_CAST_TIME,
-	BLINK_CAST_TIME,
-} from '../../rules.js';
+import {RULES, ARENA_MIN, ARENA_MAX} from '../../rules.js';
 import {getMissileCastTime, getLeadPosition} from '../../utils/combat.js';
 import {
-	getThreats,
 	getMostUrgentThreat,
 	getDodgeDirectionForMovement,
 	fitMissileToBudget,
@@ -21,27 +16,30 @@ import {
 	MIN_USEFUL_DAMAGE,
 	getEnemyVulnerabilityTicks,
 	isSafeToAttack,
+	keepOffWalls,
+	getPreCastReposition,
 } from '../shared.js';
 import {useParam} from '../../engine/params-runtime.js';
 
 const WALL_BUFFER = 60;
 const SHIELD_BUFFER = 3;
 
-const HomingAI: MissileAIFunction = ({worldState}) => 
+const HomingAI: MissileFunction = () =>
 {
-	const enemy = worldState.enemies[0];
-	return {turnToward: enemy?.position};
+	const ctx = getMissileContext();
+	const enemy = ctx.worldState.enemies[0];
+	return enemy ? turnToward(enemy.position.x, enemy.position.y) : flyStraight();
 };
 
-const StraightAI: MissileAIFunction = () => ({});
+const StraightAI: MissileFunction = () => flyStraight();
 
 function isNearWall(position: {x: number; y: number}): boolean 
 {
 	return (
-		position.x < WALL_BUFFER ||
-    position.x > ARENA_SIZE - WALL_BUFFER ||
-    position.y < WALL_BUFFER ||
-    position.y > ARENA_SIZE - WALL_BUFFER
+		position.x < ARENA_MIN + WALL_BUFFER ||
+    position.x > ARENA_MAX - WALL_BUFFER ||
+    position.y < ARENA_MIN + WALL_BUFFER ||
+    position.y > ARENA_MAX - WALL_BUFFER
 	);
 }
 
@@ -59,12 +57,22 @@ function combatMove(
 	strafeIntensity: number,
 	approachSpeed: number,
 	distanceDeadZone: number,
-): {x: number; y: number} 
+	centerBias: number,
+): {x: number; y: number}
 {
 	const deltaX = enemy.position.x - position.x;
 	const deltaY = enemy.position.y - position.y;
 	const normalizedDistance = currentDistance > 0 ? currentDistance : 1;
 
+	// Approach the center-side of the enemy so knockback pushes toward center, not lava.
+	const center = (ARENA_MIN + ARENA_MAX) / 2;
+	const toCenterX = center - enemy.position.x;
+	const toCenterY = center - enemy.position.y;
+	const toCenterDist = Math.sqrt(toCenterX * toCenterX + toCenterY * toCenterY) || 1;
+	const approachDirX = deltaX / normalizedDistance + (toCenterX / toCenterDist) * centerBias;
+	const approachDirY = deltaY / normalizedDistance + (toCenterY / toCenterDist) * centerBias;
+	const approachMag = Math.sqrt(approachDirX * approachDirX + approachDirY * approachDirY) || 1;
+
 	const strafeClockwise = {
 		x: -deltaY / normalizedDistance,
 		y: deltaX / normalizedDistance,
@@ -91,16 +99,16 @@ function combatMove(
 			y: position.y + strafeCounterClockwise.y * 100,
 		};
 		const scoreClockwise = Math.min(
-			futureClockwise.x,
-			ARENA_SIZE - futureClockwise.x,
-			futureClockwise.y,
-			ARENA_SIZE - futureClockwise.y,
+			futureClockwise.x - ARENA_MIN,
+			ARENA_MAX - futureClockwise.x,
+			futureClockwise.y - ARENA_MIN,
+			ARENA_MAX - futureClockwise.y,
 		);
 		const scoreCounterClockwise = Math.min(
-			futureCounterClockwise.x,
-			ARENA_SIZE - futureCounterClockwise.x,
-			futureCounterClockwise.y,
-			ARENA_SIZE - futureCounterClockwise.y,
+			futureCounterClockwise.x - ARENA_MIN,
+			ARENA_MAX - futureCounterClockwise.x,
+			futureCounterClockwise.y - ARENA_MIN,
+			ARENA_MAX - futureCounterClockwise.y,
 		);
 		strafeDirection =
 			scoreClockwise > scoreCounterClockwise
@@ -115,34 +123,34 @@ function combatMove(
 
 	if (dodgeDirection) 
 	{
-		return {x: strafeDirection.x * 100, y: strafeDirection.y * 100};
+		return {x: strafeDirection.x, y: strafeDirection.y};
 	}
 
 	let moveX = strafeDirection.x * strafeIntensity;
 	let moveY = strafeDirection.y * strafeIntensity;
 
-	if (currentDistance > targetDistance + distanceDeadZone) 
+	if (currentDistance > targetDistance + distanceDeadZone)
 	{
-		moveX += (deltaX / normalizedDistance) * approachSpeed;
-		moveY += (deltaY / normalizedDistance) * approachSpeed;
+		moveX += (approachDirX / approachMag) * approachSpeed;
+		moveY += (approachDirY / approachMag) * approachSpeed;
 	}
 	else if (currentDistance < targetDistance - distanceDeadZone) 
 	{
 		let retreatX = -(deltaX / normalizedDistance) * approachSpeed;
 		let retreatY = -(deltaY / normalizedDistance) * approachSpeed;
-		if (position.x < WALL_BUFFER && retreatX < 0) retreatX = 0;
-		if (position.x > ARENA_SIZE - WALL_BUFFER && retreatX > 0) retreatX = 0;
-		if (position.y < WALL_BUFFER && retreatY < 0) retreatY = 0;
-		if (position.y > ARENA_SIZE - WALL_BUFFER && retreatY > 0) retreatY = 0;
+		if (position.x < ARENA_MIN + WALL_BUFFER && retreatX < 0) retreatX = 0;
+		if (position.x > ARENA_MAX - WALL_BUFFER && retreatX > 0) retreatX = 0;
+		if (position.y < ARENA_MIN + WALL_BUFFER && retreatY < 0) retreatY = 0;
+		if (position.y > ARENA_MAX - WALL_BUFFER && retreatY > 0) retreatY = 0;
 		moveX += retreatX;
 		moveY += retreatY;
 	}
 
 	const magnitude = Math.sqrt(moveX * moveX + moveY * moveY);
-	if (magnitude > 100) 
+	if (magnitude > 1)
 	{
-		moveX = (moveX / magnitude) * 100;
-		moveY = (moveY / magnitude) * 100;
+		moveX = moveX / magnitude;
+		moveY = moveY / magnitude;
 	}
 
 	return {x: moveX, y: moveY};
@@ -165,78 +173,91 @@ function combatMove(
  * PROGRESSION LINE: Battlemage → Warmage → Archmage
  * TIER: 3 (elite Duelist line)
  */
-export const Archmage: WizardFunction = ({state}) => 
+export function Archmage(): FinalAction
 {
-	const targetDistance = useParam('targetDistance', 214, {
+	const position = usePosition();
+	const enemy = useEnemy();
+	const status = useStatus();
+	const blinkCooldown = useBlinkCooldown();
+	const health = useHealth();
+	const tick = useTick();
+	const threats = useThreats();
+	const projectiles = useProjectiles();
+	const lastMissileConfig = useLastMissileConfig();
+	const castingSpell = useCastingSpell();
+	const castProgressData = useCastProgress();
+
+
+	const targetDistance = useParam('targetDistance', 341, {
 		range: 150,
 		min: 0,
 	});
-	const minTurnRate = useParam('minTurnRate', -14.6, {range: 1.5, steps: 5});
-	const blinkEscapeDistance = useParam('blinkEscapeDistance', 442, {
+	const minTurnRate = useParam('minTurnRate', 0.4, {range: 1.5, min: 0, steps: 5});
+	const blinkEscapeDistance = useParam('blinkEscapeDistance', 233, {
 		range: 190,
 		min: 0,
 		steps: 7,
 	});
-	const punishMinVulnerability = useParam('punishMinVulnerability', 85, {
+	const punishMinVulnerability = useParam('punishMinVulnerability', 70, {
 		range: 30,
 		min: 10,
 		steps: 5,
 	});
-	const aggressiveHPThreshold = useParam('aggressiveHPThreshold', 4, {
+	const aggressiveHPThreshold = useParam('aggressiveHPThreshold', 8, {
 		range: 20,
 		min: 0,
 		steps: 5,
 	});
 	const preferBlinkDodge =
 		useParam('preferBlinkDodge', 1, {min: 0, max: 1, steps: 2}) >= 0.5;
-	const strafeCyclePeriod = useParam('strafeCyclePeriod', 248, {
+	const strafeCyclePeriod = useParam('strafeCyclePeriod', 249, {
 		range: 75,
 		min: 80,
 		max: 250,
 	});
-	const strafeIntensity = useParam('strafeIntensity', 100, {
-		range: 40,
-		min: 20,
-		max: 100,
+	const strafeIntensity = useParam('strafeIntensity', 0.97, {
+		range: 0.4,
+		min: 0.2,
+		max: 1,
 		steps: 7,
 	});
-	const approachSpeed = useParam('approachSpeed', 57, {
-		range: 30,
-		min: 10,
-		max: 80,
+	const approachSpeed = useParam('approachSpeed', 0.7, {
+		range: 0.3,
+		min: 0.1,
+		max: 0.8,
 		steps: 7,
 	});
-	const distanceDeadZone = useParam('distanceDeadZone', 37, {
+	const distanceDeadZone = useParam('distanceDeadZone', 30, {
 		range: 30,
 		min: 10,
 		max: 80,
 		steps: 7,
 	});
-	const aggressiveDistanceOffset = useParam('aggressiveDistanceOffset', 99, {
+	const aggressiveDistanceOffset = useParam('aggressiveDistanceOffset', 11, {
 		range: 50,
 		min: 0,
 		max: 100,
 		steps: 7,
 	});
-	const cautiousDistanceOffset = useParam('cautiousDistanceOffset', 42, {
+	const cautiousDistanceOffset = useParam('cautiousDistanceOffset', 31, {
 		range: 50,
 		min: 0,
 		max: 120,
 		steps: 7,
 	});
-	const cancelHeavyDmg = useParam('cancelHeavyDmg', 40, {
+	const cancelHeavyDmg = useParam('cancelHeavyDmg', 30, {
 		range: 15,
 		min: 5,
 		max: 40,
 		steps: 5,
 	});
-	const cancelMediumDmg = useParam('cancelMediumDmg', 20, {
+	const cancelMediumDmg = useParam('cancelMediumDmg', 21, {
 		range: 10,
 		min: 3,
 		max: 25,
 		steps: 5,
 	});
-	const cancelCastRatio = useParam('cancelCastRatio', 0.74, {
+	const cancelCastRatio = useParam('cancelCastRatio', 0.6, {
 		range: 0.4,
 		min: 0.3,
 		max: 1.0,
@@ -247,19 +268,19 @@ export const Archmage: WizardFunction = ({state}) =>
 		min: 50,
 		max: 300,
 	});
-	const blinkWindowMax = useParam('blinkWindowMax', 29, {
+	const blinkWindowMax = useParam('blinkWindowMax', 69, {
 		range: 40,
 		min: 20,
 		max: 120,
 		steps: 7,
 	});
-	const blinkGapThreshold = useParam('blinkGapThreshold', 80, {
+	const blinkGapThreshold = useParam('blinkGapThreshold', 111, {
 		range: 75,
 		min: 20,
 		max: 200,
 		steps: 7,
 	});
-	const flightTimeDivisor = useParam('flightTimeDivisor', 4.5, {
+	const flightTimeDivisor = useParam('flightTimeDivisor', 8.9, {
 		range: 4,
 		min: 2,
 		max: 12,
@@ -270,82 +291,92 @@ export const Archmage: WizardFunction = ({state}) =>
 		50,
 		{range: 100, min: 50, max: 300, steps: 7},
 	);
-	const safeAttackCastEstimate = useParam('safeAttackCastEstimate', 35, {
-		range: 25,
-		min: 10,
-		max: 80,
+	const centerBias = useParam('centerBias', 0.48, {
+		range: 0.4,
+		min: 0,
+		max: 0.8,
 		steps: 5,
 	});
+	const maxBlinkDistance = useParam('maxBlinkDistance', 200, {
+		range: 100,
+		min: 50,
+		max: 300,
+		steps: 7,
+	});
 
-	const enemy = state.enemies[0];
-	if (!enemy) 
+	function capBlinkDistance(target: {x: number; y: number}): {x: number; y: number}
 	{
-		return {move: {x: 0, y: 0}};
+		const dx = target.x - position.x;
+		const dy = target.y - position.y;
+		const dist = Math.sqrt(dx * dx + dy * dy);
+		if (dist <= maxBlinkDistance) return target;
+		const scale = maxBlinkDistance / dist;
+		return {x: position.x + dx * scale, y: position.y + dy * scale};
 	}
 
-	const distance = distanceTo(state.position, enemy.position);
-	const threats = getThreats(state);
+	const distance = distanceTo(position, enemy.position);
 	const urgentThreat = getMostUrgentThreat(threats);
-	const dodgeDirection = getDodgeDirectionForMovement(threats, state.position);
+	const dodgeDirection = getDodgeDirectionForMovement(threats, position);
 
 	// HP-aware distance: ahead → fight closer, behind → kite at range
-	const hpDiff = state.health - enemy.health;
+	const hpDiff = health - enemy.health;
 	const isAggressive = hpDiff >= -aggressiveHPThreshold;
 	const effectiveTargetDistance = isAggressive
 		? targetDistance - aggressiveDistanceOffset
 		: targetDistance + cautiousDistanceOffset;
 
 	const move = combatMove(
-		state.position,
+		position,
 		enemy,
 		distance,
 		effectiveTargetDistance,
 		dodgeDirection,
-		state.tick,
+		tick,
 		strafeCyclePeriod,
 		strafeIntensity,
 		approachSpeed,
 		distanceDeadZone,
+		centerBias,
 	);
-
+	const safeMove = keepOffWalls(position, move);
 	// === STEP 1: CHANNELING ===
-	if (state.state === 'channeling') 
+	if (status === 'channeling') 
 	{
 		if (!urgentThreat || urgentThreat.ticksToImpact > shieldCancelThreshold) 
 		{
-			return {move, cancel: true};
+			return cancel().move(safeMove.x, safeMove.y);
 		}
-		return {move: {x: 0, y: 0}};
+		return idle();
 	}
 
 	// === STEP 2: PROGRESSIVE CAST-CANCEL ===
 	if (
-		state.state === 'casting' &&
-    state.castingSpell === 'missile' &&
+		status === 'casting' &&
+    castingSpell === 'missile' &&
     urgentThreat &&
     !urgentThreat.bestDodgeDirection
 	) 
 	{
-		const remainingCast = (state.castDuration ?? 0) - (state.castProgress ?? 0);
+		const remainingCast = ((castProgressData?.total) ?? 0) - ((castProgressData?.current) ?? 0);
 		const defenseTime =
-			state.blinkCooldown === 0
-				? BLINK_CAST_TIME
-				: SHIELD_CAST_TIME + SHIELD_BUFFER;
+			blinkCooldown === 0
+				? RULES.BLINK_CAST_TIME
+				: RULES.SHIELD_CAST_TIME + SHIELD_BUFFER;
 		const willArriveInWindow =
-			urgentThreat.ticksToImpact <= remainingCast + GCD_DURATION + defenseTime;
+			urgentThreat.ticksToImpact <= remainingCast + RULES.GCD_DURATION + defenseTime;
 
 		if (willArriveInWindow) 
 		{
 			const incomingDamage = urgentThreat.projectile.damage;
-			const castRatio = (state.castProgress ?? 0) / (state.castDuration ?? 1);
+			const castRatio = ((castProgressData?.current) ?? 0) / ((castProgressData?.total) ?? 1);
 
-			if (incomingDamage >= state.health || incomingDamage >= cancelHeavyDmg) 
+			if (incomingDamage >= health || incomingDamage >= cancelHeavyDmg) 
 			{
-				return {move, cancel: true};
+				return cancel().move(safeMove.x, safeMove.y);
 			}
 			if (incomingDamage >= cancelMediumDmg && castRatio < cancelCastRatio) 
 			{
-				return {move, cancel: true};
+				return cancel().move(safeMove.x, safeMove.y);
 			}
 		}
 	}
@@ -353,72 +384,66 @@ export const Archmage: WizardFunction = ({state}) =>
 	// === STEP 3: BLINK-DODGE — 100% damage avoidance (optimizer-controlled) ===
 	if (
 		preferBlinkDodge &&
-    state.state === 'idle' &&
+    status === 'idle' &&
     urgentThreat &&
-    state.blinkCooldown === 0 &&
+    blinkCooldown === 0 &&
     (!urgentThreat.bestDodgeDirection || shouldForceShield(urgentThreat)) &&
-    urgentThreat.ticksToImpact >= BLINK_CAST_TIME &&
+    urgentThreat.ticksToImpact >= RULES.BLINK_CAST_TIME &&
     urgentThreat.ticksToImpact <= blinkWindowMax
 	) 
 	{
 		// Aggressive: blink toward enemy to dodge + close gap
 		// Defensive: blink away to dodge + increase distance
-		if (isAggressive && distance > effectiveTargetDistance) 
+		if (isAggressive && distance > effectiveTargetDistance)
 		{
 			const blinkTarget = getBlinkToDecreaseDistance(
-				state.position,
+				position,
 				enemy.position,
-				state.projectiles,
+				projectiles,
 			);
-			if (blinkTarget) 
+			if (blinkTarget)
 			{
-				return {
-					move: {x: 0, y: 0},
-					startCast: {spell: 'blink', target: blinkTarget},
-				};
+				const capped = capBlinkDistance(blinkTarget);
+				return blink(capped.x, capped.y);
 			}
 		}
 		const blinkTarget = getBlinkToIncreaseDistance(
-			state.position,
+			position,
 			enemy.position,
-			state.projectiles,
+			projectiles,
 			MIN_BLINK_ESCAPE_DISTANCE,
 		);
-		if (blinkTarget) 
+		if (blinkTarget)
 		{
-			return {
-				move: {x: 0, y: 0},
-				startCast: {spell: 'blink', target: blinkTarget},
-			};
+			const capped = capBlinkDistance(blinkTarget);
+			return blink(capped.x, capped.y);
 		}
 	}
 
 	// === STEP 4: BLINK ESCAPE — enemy too close ===
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     distance < blinkEscapeDistance &&
-    state.blinkCooldown === 0 &&
+    blinkCooldown === 0 &&
     (!urgentThreat || urgentThreat.bestDodgeDirection !== null)
 	) 
 	{
 		const escapeTarget = getBlinkToIncreaseDistance(
-			state.position,
+			position,
 			enemy.position,
-			state.projectiles,
+			projectiles,
 			MIN_BLINK_ESCAPE_DISTANCE,
 		);
-		if (escapeTarget) 
+		if (escapeTarget)
 		{
-			return {
-				move: {x: 0, y: 0},
-				startCast: {spell: 'blink', target: escapeTarget},
-			};
+			const capped = capBlinkDistance(escapeTarget);
+			return blink(capped.x, capped.y);
 		}
 	}
 
 	// === STEP 5: SHIELD ===
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     urgentThreat &&
     (!urgentThreat.bestDodgeDirection || shouldForceShield(urgentThreat))
 	) 
@@ -426,20 +451,38 @@ export const Archmage: WizardFunction = ({state}) =>
 		if (
 			urgentThreat.canBlockInTime &&
       urgentThreat.ticksToStartShield <= SHIELD_BUFFER &&
-      (state.blinkCooldown > 0 || urgentThreat.ticksToImpact < 10)
+      (blinkCooldown > 0 || urgentThreat.ticksToImpact < 10)
 		) 
 		{
-			return {
-				move: {x: 0, y: 0},
-				startCast: {spell: 'shield'},
-			};
+			return shield();
+		}
+	}
+
+	// === Preemptive shield — shield when enemy is casting a missile at close range ===
+	if (
+		status === 'idle' &&
+		distance < 300 &&
+		enemy.status === 'casting' &&
+		enemy.castingSpell === 'missile'
+	)
+	{
+		const remainingCast = (enemy.castDuration ?? 0) - (enemy.castProgress ?? 0);
+		const estimatedFlightTicks = distance / 8;
+		const ticksUntilHit = remainingCast + estimatedFlightTicks;
+
+		if (
+			ticksUntilHit >= RULES.SHIELD_CAST_TIME &&
+			ticksUntilHit < RULES.SHIELD_CAST_TIME + 15
+		)
+		{
+			return shield();
 		}
 	}
 
 	// === STEP 6: VULNERABILITY BLINK — gap-close during enemy cast/GCD ===
 	if (
-		state.state === 'idle' &&
-    state.blinkCooldown === 0 &&
+		status === 'idle' &&
+    blinkCooldown === 0 &&
     isAggressive &&
     distance > effectiveTargetDistance + blinkGapThreshold &&
     (!urgentThreat || urgentThreat.bestDodgeDirection !== null)
@@ -449,27 +492,28 @@ export const Archmage: WizardFunction = ({state}) =>
 		if (vulnerabilityTicks >= punishMinVulnerability) 
 		{
 			const blinkTarget = getBlinkToDecreaseDistance(
-				state.position,
+				position,
 				enemy.position,
-				state.projectiles,
+				projectiles,
 			);
-			if (blinkTarget) 
+			if (blinkTarget)
 			{
-				return {
-					move: {x: 0, y: 0},
-					startCast: {spell: 'blink', target: blinkTarget},
-				};
+				const capped = capBlinkDistance(blinkTarget);
+				return blink(capped.x, capped.y);
 			}
 		}
 	}
 
 	// === STEP 7: OFFENSE ===
-	if (state.state === 'idle' && distance < 500) 
+	if (status === 'idle' && distance < 500)
 	{
+		const reposition = getPreCastReposition(position, enemy.position);
+		if (reposition) return moveAction(reposition.x, reposition.y);
+
 		const offenseDefenseTime =
-			state.blinkCooldown === 0
-				? BLINK_CAST_TIME
-				: SHIELD_CAST_TIME + SHIELD_BUFFER;
+			blinkCooldown === 0
+				? RULES.BLINK_CAST_TIME
+				: RULES.SHIELD_CAST_TIME + SHIELD_BUFFER;
 		const enemyHP = Math.ceil(enemy.health);
 		const vulnerabilityTicks = getEnemyVulnerabilityTicks(enemy);
 
@@ -479,7 +523,7 @@ export const Archmage: WizardFunction = ({state}) =>
 			const flightTimeEstimate = distance / flightTimeDivisor;
 			const punishBudget = vulnerabilityTicks - flightTimeEstimate;
 			const nextThreatTime = urgentThreat?.ticksToImpact ?? Infinity;
-			const safeBudget = nextThreatTime - GCD_DURATION - offenseDefenseTime;
+			const safeBudget = nextThreatTime - RULES.GCD_DURATION - offenseDefenseTime;
 			const effectiveBudget = Math.min(
 				punishBudget,
 				safeBudget,
@@ -493,12 +537,12 @@ export const Archmage: WizardFunction = ({state}) =>
 				const config = fitMissileToBudget(effectiveBudget, distance, {
 					minTurnRate: punishTurnRate,
 					maxDamage: enemyHP,
-					lastMissileConfig: state.lastMissileConfig,
+					lastMissileConfig: lastMissileConfig,
 				});
 
 				if (config && config.damage >= MIN_USEFUL_DAMAGE) 
 				{
-					const castTime = getMissileCastTime(config, state.lastMissileConfig);
+					const castTime = getMissileCastTime(config, lastMissileConfig);
 					const actualFlight = distance / config.speed;
 
 					if (
@@ -513,17 +557,9 @@ export const Archmage: WizardFunction = ({state}) =>
 									enemy.position,
 									enemy.velocity,
 									config.speed,
-									state.position,
+									position,
 								);
-						return {
-							move,
-							startCast: {
-								spell: 'missile',
-								config,
-								missileAI: config.turnRate > 0 ? HomingAI : StraightAI,
-								direction: angleTo(state.position, aimTarget),
-							},
-						};
+						return missile(config, config.turnRate > 0 ? HomingAI : StraightAI, angleTo(position, aimTarget)).move(safeMove.x, safeMove.y);
 					}
 				}
 			}
@@ -531,7 +567,7 @@ export const Archmage: WizardFunction = ({state}) =>
 
 		// --- STANDARD MODE: range-adaptive missiles ---
 		const nextThreatTime = urgentThreat?.ticksToImpact ?? Infinity;
-		const safeBudget = nextThreatTime - GCD_DURATION - offenseDefenseTime;
+		const safeBudget = nextThreatTime - RULES.GCD_DURATION - offenseDefenseTime;
 		const budgetTicks = Math.min(safeBudget, MAX_CAST_BUDGET);
 
 		// Adapt turn rate to distance: close → straight, far → homing
@@ -541,48 +577,32 @@ export const Archmage: WizardFunction = ({state}) =>
 		let config = fitMissileToBudget(budgetTicks, distance, {
 			minTurnRate: effectiveMinTurnRate,
 			maxDamage: enemyHP,
-			lastMissileConfig: state.lastMissileConfig,
+			lastMissileConfig: lastMissileConfig,
 		});
 
-		if (
-			config &&
-      config.damage >= minDmg &&
-      isSafeToAttack(threats, safeAttackCastEstimate)
-		) 
+		if (config && config.damage >= minDmg)
 		{
-			return {
-				move,
-				startCast: {
-					spell: 'missile',
-					config,
-					missileAI: config.turnRate > 0 ? HomingAI : StraightAI,
-					direction: angleTo(state.position, enemy.position),
-				},
-			};
+			const actualCastTime = getMissileCastTime(config, lastMissileConfig);
+			if (isSafeToAttack(threats, actualCastTime))
+			{
+				return missile(config, config.turnRate > 0 ? HomingAI : StraightAI, angleTo(position, enemy.position)).move(safeMove.x, safeMove.y);
+			}
 		}
 
-		// Fallback: fire bigger missile, accept incoming hit
-		if (!config || config.damage < minDmg) 
+		// Fallback: fire bigger missile, accept incoming hit — but only if no undodgeable threat
+		if (!config || config.damage < minDmg)
 		{
 			config = fitMissileToBudget(MAX_CAST_BUDGET, distance, {
 				minTurnRate: effectiveMinTurnRate,
 				maxDamage: enemyHP,
-				lastMissileConfig: state.lastMissileConfig,
+				lastMissileConfig: lastMissileConfig,
 			});
-			if (config) 
+			if (config && (!urgentThreat || urgentThreat.bestDodgeDirection !== null))
 			{
-				return {
-					move,
-					startCast: {
-						spell: 'missile',
-						config,
-						missileAI: config.turnRate > 0 ? HomingAI : StraightAI,
-						direction: angleTo(state.position, enemy.position),
-					},
-				};
+				return missile(config, config.turnRate > 0 ? HomingAI : StraightAI, angleTo(position, enemy.position)).move(safeMove.x, safeMove.y);
 			}
 		}
 	}
 
-	return {move};
-};
+	return moveAction(safeMove.x, safeMove.y);
+}