@vibemancer/core 0.1.4 → 0.1.5

package/src/bots/berserker/02_Stormcaller.ts

@@ -1,14 +1,10 @@
-import {
-	WizardFunction,
-	MissileAIFunction,
-	MissileActions,
-} from '../../types.js';
+import type {FinalAction, MissileFunction} from '../../hooks/index.js';
+import {usePosition, useEnemy, useStatus, useBlinkCooldown, useHealth, useTick, useThreats, 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 {interceptAngle, moveInDirection} from '../../utils/movement.js';
-import {ARENA_SIZE, GCD_DURATION, SHIELD_CAST_TIME} from '../../rules.js';
+import {RULES, ARENA_MIN, ARENA_MAX} from '../../rules.js';
 import {
-	getThreats,
 	getMostUrgentThreat,
 	getDodgeDirectionForMovement,
 	getBlinkToCenter,
@@ -16,6 +12,8 @@ import {
 	shouldForceShield,
 	MAX_CAST_BUDGET,
 	MIN_USEFUL_DAMAGE,
+	keepOffWalls,
+	getPreCastReposition,
 } from '../shared.js';
 import {useParam} from '../../engine/params-runtime.js';
 const WALL_BUFFER = 80;
@@ -25,37 +23,38 @@ const SHIELD_BUFFER = 3;
 /**
  * Predictive homing missile AI - leads the target.
  */
-const StormcallerMissileAI: MissileAIFunction = ({
-	worldState,
-	missileState,
-}) => 
+const StormcallerMissileAI: MissileFunction = () =>
 {
-	const enemy = worldState.enemies[0];
-	if (!enemy) return {};
+	const ctx = getMissileContext();
+	const enemy = ctx.worldState.enemies[0];
+	if (enemy.health <= 0) return flyStraight();
 
 	const angle = interceptAngle(
-		missileState.position,
+		ctx.position,
 		enemy.position,
 		enemy.velocity,
-		missileState.speed,
+		ctx.speed,
 	);
-	if (angle !== null) 
+	if (angle !== null)
 	{
-		return {turnToward: moveInDirection(missileState.position, angle, 100)};
+		const target = moveInDirection(ctx.position, angle, 100);
+		return turnToward(target.x, target.y);
 	}
-	return {turnToward: enemy.position};
+	return turnToward(enemy.position.x, enemy.position.y);
 };
 
+const StraightAI: MissileFunction = () => flyStraight();
+
 /**
  * Check if position is near a wall.
  */
 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
 	);
 }
 
@@ -73,12 +72,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,
@@ -105,16 +114,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
@@ -129,34 +138,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};
@@ -178,10 +187,22 @@ function combatMove(
  *
  * TIER: 2 (enhanced Stormchaser)
  */
-export const Stormcaller: WizardFunction = ({state}) => 
+export function Stormcaller(): FinalAction
 {
+	const position = usePosition();
+	const enemy = useEnemy();
+	const status = useStatus();
+	const blinkCooldown = useBlinkCooldown();
+	const health = useHealth();
+	const tick = useTick();
+	const threats = useThreats();
+	const lastMissileConfig = useLastMissileConfig();
+	const castingSpell = useCastingSpell();
+	const castProgressData = useCastProgress();
+
+
 	// Tunable parameters (run optimizer script to find optimal values)
-	const targetDistance = useParam('targetDistance', 129, {
+	const targetDistance = useParam('targetDistance', 176, {
 		range: 200,
 		min: 0,
 	});
@@ -191,24 +212,24 @@ export const Stormcaller: WizardFunction = ({state}) =>
 		min: 1,
 		steps: 7,
 	});
-	const strafeCyclePeriod = useParam('strafeCyclePeriod', 281, {
+	const strafeCyclePeriod = useParam('strafeCyclePeriod', 208, {
 		range: 75,
 		min: 80,
 		max: 300,
 	});
-	const strafeIntensity = useParam('strafeIntensity', 69, {
-		range: 40,
-		min: 20,
-		max: 100,
+	const strafeIntensity = useParam('strafeIntensity', 0.9, {
+		range: 0.4,
+		min: 0.2,
+		max: 1,
 		steps: 7,
 	});
-	const approachSpeed = useParam('approachSpeed', 69, {
-		range: 30,
-		min: 10,
-		max: 70,
+	const approachSpeed = useParam('approachSpeed', 0.45, {
+		range: 0.3,
+		min: 0.1,
+		max: 0.7,
 		steps: 7,
 	});
-	const distanceDeadZone = useParam('distanceDeadZone', 18, {
+	const distanceDeadZone = useParam('distanceDeadZone', 33, {
 		range: 25,
 		min: 10,
 		max: 60,
@@ -219,78 +240,95 @@ export const Stormcaller: WizardFunction = ({state}) =>
 		min: 50,
 		max: 300,
 	});
-	const blinkWindowMax = useParam('blinkWindowMax', 70, {
+	const blinkWindowMax = useParam('blinkWindowMax', 31, {
 		range: 40,
 		min: 20,
 		max: 120,
 		steps: 7,
 	});
-	const attackRange = useParam('attackRange', 430, {
+	const attackRange = useParam('attackRange', 590, {
 		range: 200,
 		min: 300,
 		max: 800,
 	});
-	const flightTimeDivisor = useParam('flightTimeDivisor', 10.8, {
+	const flightTimeDivisor = useParam('flightTimeDivisor', 10.5, {
 		range: 4,
 		min: 2,
 		max: 12,
 		steps: 5,
 	});
+	const centerBias = useParam('centerBias', 0.26, {
+		range: 0.4,
+		min: 0,
+		max: 0.8,
+		steps: 5,
+	});
+	const maxBlinkDistance = useParam('maxBlinkDistance', 178, {
+		range: 100,
+		min: 50,
+		max: 300,
+		steps: 7,
+	});
+
+	const distance = distanceTo(position, enemy.position);
 
-	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);
-
 	// Analyze threats using simulation
-	const threats = getThreats(state);
 	const urgentThreat = getMostUrgentThreat(threats);
 
 	// === DEFENSE: Handle channeling state ===
-	if (state.state === 'channeling') 
+	if (status === 'channeling') 
 	{
 		if (!urgentThreat || urgentThreat.ticksToImpact > shieldCancelThreshold) 
 		{
-			return {move: {x: 0, y: 0}, cancel: true};
+			return cancel();
 		}
-		return {move: {x: 0, y: 0}};
+		return idle();
 	}
 
 	// === DEFENSE: Cancel missile cast only for LETHAL incoming damage ===
 	// DPS trade: we accepted the hit when we started casting. Only cancel to survive.
 	if (
-		state.state === 'casting' &&
-    state.castingSpell === 'missile' &&
+		status === 'casting' &&
+    castingSpell === 'missile' &&
     urgentThreat &&
-    urgentThreat.projectile.damage >= state.health
+    urgentThreat.projectile.damage >= health
 	) 
 	{
-		const remainingCast = (state.castDuration ?? 0) - (state.castProgress ?? 0);
+		const remainingCast = ((castProgressData?.total) ?? 0) - ((castProgressData?.current) ?? 0);
 		if (
 			urgentThreat.ticksToImpact <=
-      remainingCast + GCD_DURATION + SHIELD_CAST_TIME + 1
+      remainingCast + RULES.GCD_DURATION + RULES.SHIELD_CAST_TIME + 1
 		) 
 		{
 			const dodgeDirection = getDodgeDirectionForMovement(
 				threats,
-				state.position,
+				position,
 			);
-			const move = combatMove(
-				state.position,
+			const cancelMove = combatMove(
+				position,
 				enemy,
 				distance,
 				targetDistance,
 				dodgeDirection,
-				state.tick,
+				tick,
 				strafeCyclePeriod,
 				strafeIntensity,
 				approachSpeed,
 				distanceDeadZone,
+				centerBias,
 			);
-			return {move, cancel: true};
+			const safeCancelMove = keepOffWalls(position, cancelMove);
+			return cancel().move(safeCancelMove.x, safeCancelMove.y);
 		}
 	}
 
@@ -298,27 +336,25 @@ export const Stormcaller: WizardFunction = ({state}) =>
 	// Blink dodges the incoming missile — no GCD after, so can immediately fire back.
 	// Only shield when blink is on cooldown.
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     urgentThreat &&
-    state.blinkCooldown === 0 &&
+    blinkCooldown === 0 &&
     urgentThreat.ticksToImpact >= 10 &&
     urgentThreat.ticksToImpact <= blinkWindowMax
 	) 
 	{
-		return {
-			move: {x: 0, y: 0},
-			startCast: {spell: 'blink', target: getBlinkToCenter(state.position)},
-		};
+		const blinkTarget = capBlinkDistance(getBlinkToCenter(position));
+		return blink(blinkTarget.x, blinkTarget.y);
 	}
 
 	// === DEFENSE: Shield threats (when blink is on cooldown) ===
-	if (state.state === 'idle' && urgentThreat) 
+	if (status === 'idle' && urgentThreat) 
 	{
 		const forceShield = shouldForceShield(urgentThreat);
 		const undodgeable = !urgentThreat.bestDodgeDirection;
-		const healthLow = state.health < shieldHealthThreshold;
+		const healthLow = health < shieldHealthThreshold;
 		const healthCritical =
-			state.health <= urgentThreat.projectile.damage * 2 + 1;
+			health <= urgentThreat.projectile.damage * 2 + 1;
 		const doShield =
 			forceShield || (undodgeable && healthLow) || healthCritical;
 
@@ -326,36 +362,58 @@ export const Stormcaller: WizardFunction = ({state}) =>
 		{
 			if (urgentThreat.ticksToStartShield <= 3) 
 			{
-				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();
+		}
+	}
+
 	// === MOVEMENT: Smart combat movement ===
-	const dodgeDirection = getDodgeDirectionForMovement(threats, state.position);
+	const dodgeDirection = getDodgeDirectionForMovement(threats, position);
 	const move = combatMove(
-		state.position,
+		position,
 		enemy,
 		distance,
 		targetDistance,
 		dodgeDirection,
-		state.tick,
+		tick,
 		strafeCyclePeriod,
 		strafeIntensity,
 		approachSpeed,
 		distanceDeadZone,
+		centerBias,
 	);
-
+	const safeMove = keepOffWalls(position, move);
 	// === OFFENSE: Adaptive missile fitting with predictive homing ===
-	if (state.state === 'idle' && distance < attackRange) 
+	if (status === 'idle' && distance < attackRange)
 	{
+		const reposition = getPreCastReposition(position, enemy.position);
+		if (reposition) return moveAction(reposition.x, reposition.y);
+
 		let nextThreatTime = urgentThreat?.ticksToImpact ?? Infinity;
 
 		// Account for enemy's active cast — their missile will arrive after cast completes + flight time
-		if (enemy.state === 'casting' && enemy.castingSpell === 'missile') 
+		if (enemy.status === 'casting' && enemy.castingSpell === 'missile') 
 		{
 			const remainingEnemyCast =
 				(enemy.castDuration ?? 0) - (enemy.castProgress ?? 0);
@@ -367,7 +425,7 @@ export const Stormcaller: WizardFunction = ({state}) =>
 		}
 
 		const safeBudget =
-			nextThreatTime - GCD_DURATION - SHIELD_CAST_TIME - SHIELD_BUFFER;
+			nextThreatTime - RULES.GCD_DURATION - RULES.SHIELD_CAST_TIME - SHIELD_BUFFER;
 		const budgetTicks = Math.min(safeBudget, MAX_CAST_BUDGET);
 
 		// Predictive homing compensates for movement during cast
@@ -376,23 +434,12 @@ export const Stormcaller: WizardFunction = ({state}) =>
 		const config = fitMissileToBudget(budgetTicks, distance, {
 			minTurnRate,
 			maxDamage: enemyHP,
-			lastMissileConfig: state.lastMissileConfig,
+			lastMissileConfig: lastMissileConfig,
 		});
 
 		if (config && config.damage >= minDmg) 
 		{
-			return {
-				move,
-				startCast: {
-					spell: 'missile',
-					config,
-					missileAI:
-            config.turnRate > 0
-            	? StormcallerMissileAI
-            	: (): MissileActions => ({}),
-					direction: angleTo(state.position, enemy.position),
-				},
-			};
+			return missile(config, config.turnRate > 0 ? StormcallerMissileAI : StraightAI, angleTo(position, enemy.position)).move(safeMove.x, safeMove.y);
 		}
 
 		// Budget too small for useful missile — wait for threat to pass, then fire
@@ -400,18 +447,15 @@ export const Stormcaller: WizardFunction = ({state}) =>
 
 	// === FALLBACK DEFENSE: Shield when no attack window exists ===
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     urgentThreat &&
     !urgentThreat.bestDodgeDirection &&
     urgentThreat.canBlockInTime &&
     urgentThreat.ticksToStartShield <= 3
 	) 
 	{
-		return {
-			move: {x: 0, y: 0},
-			startCast: {spell: 'shield'},
-		};
+		return shield();
 	}
 
-	return {move};
-};
+	return moveAction(safeMove.x, safeMove.y);
+}