@vibemancer/core 0.1.3 → 0.1.5

package/src/bots/duelist/01_Battlemage.ts

@@ -1,15 +1,17 @@
-import {WizardFunction, MissileAIFunction} from '../../types.js';
+import type {FinalAction, MissileFunction} from '../../hooks/index.js';
+import {usePosition, useEnemy, useStatus, useBlinkCooldown, useHealth, useTick, useThreats, useProjectiles, 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 {getMissileCastTime} from '../../utils/combat.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,
 	isSafeToAttack,
 	getBlinkToDecreaseDistance,
 	shouldForceShield,
+	keepOffWalls,
+	getPreCastReposition,
 } from '../shared.js';
 import {useParam} from '../../engine/params-runtime.js';
 const WALL_BUFFER = 60;
@@ -23,12 +25,11 @@ const QUICK_RANGE = QUICK_CONFIG.speed * QUICK_CONFIG.duration; // 350
 /**
  * Standard homing missile AI.
  */
-const StandardHoming: MissileAIFunction = ({worldState}) => 
+const StandardHoming: 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();
 };
 
 /**
@@ -37,10 +38,10 @@ const StandardHoming: MissileAIFunction = ({worldState}) =>
 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
 	);
 }
 
@@ -58,12 +59,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;
+
 	// Perpendicular directions
 	const strafeClockwise = {
 		x: -deltaY / normalizedDistance,
@@ -93,16 +104,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
@@ -119,36 +130,36 @@ function combatMove(
 	// When actively dodging, commit fully — no approach/retreat dilution
 	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;
 
 	// Distance management (only when not dodging)
-	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;
 	}
 
 	// Normalize
 	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};
@@ -171,30 +182,42 @@ function combatMove(
  *
  * TIER: 1 (base)
  */
-export const Battlemage: WizardFunction = ({state}) => 
+export function Battlemage(): FinalAction
 {
-	const targetDistance = useParam('targetDistance', 274, {
+	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 castingSpell = useCastingSpell();
+	const castProgressData = useCastProgress();
+
+
+	const targetDistance = useParam('targetDistance', 392, {
 		range: 150,
 		min: 150,
 	});
-	const strafeCyclePeriod = useParam('strafeCyclePeriod', 219, {
+	const strafeCyclePeriod = useParam('strafeCyclePeriod', 240, {
 		range: 75,
 		min: 80,
 		max: 300,
 	});
-	const strafeIntensity = useParam('strafeIntensity', 36, {
-		range: 40,
-		min: 20,
-		max: 100,
+	const strafeIntensity = useParam('strafeIntensity', 0.87, {
+		range: 0.4,
+		min: 0.2,
+		max: 1,
 		steps: 7,
 	});
-	const approachSpeed = useParam('approachSpeed', 80, {
-		range: 30,
-		min: 10,
-		max: 80,
+	const approachSpeed = useParam('approachSpeed', 0.8, {
+		range: 0.3,
+		min: 0.1,
+		max: 0.8,
 		steps: 7,
 	});
-	const distanceDeadZone = useParam('distanceDeadZone', 31, {
+	const distanceDeadZone = useParam('distanceDeadZone', 64, {
 		range: 30,
 		min: 10,
 		max: 80,
@@ -205,7 +228,7 @@ export const Battlemage: WizardFunction = ({state}) =>
 		min: 50,
 		max: 300,
 	});
-	const blinkWindowMax = useParam('blinkWindowMax', 35, {
+	const blinkWindowMax = useParam('blinkWindowMax', 15, {
 		range: 30,
 		min: 15,
 		max: 80,
@@ -217,81 +240,98 @@ export const Battlemage: WizardFunction = ({state}) =>
 		max: 100,
 		steps: 7,
 	});
-	const cancelMinRemainingCast = useParam('cancelMinRemainingCast', 19, {
+	const cancelMinRemainingCast = useParam('cancelMinRemainingCast', 36, {
 		range: 30,
 		min: 5,
 		max: 100,
 		steps: 7,
 	});
-	const interruptRange = useParam('interruptRange', 324, {
+	const interruptRange = useParam('interruptRange', 150, {
 		range: 150,
 		min: 150,
 		max: 600,
 		steps: 7,
 	});
-	const attackRange = useParam('attackRange', 556, {
+	const attackRange = useParam('attackRange', 662, {
 		range: 150,
 		min: 200,
 		max: 700,
 	});
+	const centerBias = useParam('centerBias', 0.04, {
+		range: 0.4,
+		min: 0,
+		max: 0.8,
+		steps: 5,
+	});
+	const maxBlinkDistance = useParam('maxBlinkDistance', 216, {
+		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 ===
-	if (state.state === 'channeling') 
+	if (status === 'channeling') 
 	{
 		// Cancel shield if no imminent threats
 		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 long missile casts if undodgeable threat approaches ===
 	// Only cancel when health is too low to trade (aggressive casts accepted the risk).
 	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);
 		if (
 			remainingCast > cancelMinRemainingCast &&
       urgentThreat.ticksToImpact <=
-        remainingCast + GCD_DURATION + SHIELD_CAST_TIME + 1 &&
-      state.health <= urgentThreat.projectile.damage * 2 + 1
+        remainingCast + RULES.GCD_DURATION + RULES.SHIELD_CAST_TIME + 1 &&
+      health <= urgentThreat.projectile.damage * 2 + 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);
 		}
 	}
 
@@ -299,29 +339,27 @@ export const Battlemage: WizardFunction = ({state}) =>
 	// Blink both dodges the incoming missile AND closes distance — better than shielding.
 	// Only shield when blink is on cooldown.
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     urgentThreat &&
-    state.blinkCooldown === 0 &&
+    blinkCooldown === 0 &&
     distance > targetDistance - blinkDistanceOffset &&
     urgentThreat.ticksToImpact >= 10 &&
     urgentThreat.ticksToImpact <= blinkWindowMax
 	) 
 	{
-		const blinkTarget =
+		const rawBlinkTarget =
 			getBlinkToDecreaseDistance(
-				state.position,
+				position,
 				enemy.position,
-				state.projectiles,
+				projectiles,
 			) ?? enemy.position;
-		return {
-			move: {x: 0, y: 0},
-			startCast: {spell: 'blink', target: blinkTarget},
-		};
+		const blinkTarget = capBlinkDistance(rawBlinkTarget);
+		return blink(blinkTarget.x, blinkTarget.y);
 	}
 
 	// === DEFENSE: Shield undodgeable or high-damage homing threats (only when blink can't handle it) ===
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     urgentThreat &&
     (!urgentThreat.bestDodgeDirection || shouldForceShield(urgentThreat))
 	) 
@@ -329,49 +367,65 @@ export const Battlemage: WizardFunction = ({state}) =>
 		if (
 			urgentThreat.canBlockInTime &&
       urgentThreat.ticksToStartShield <= 3 &&
-      (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();
 		}
 	}
 
 	// Movement: smart strafe + maintain optimal distance
-	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 ===
-	if (state.state === 'idle') 
+	if (status === 'idle')
 	{
+		// Pre-cast wall discipline: don't commit to a cast we can't react out of while
+		// pinned near a wall — step toward center first so knockback can't reach lava.
+		const reposition = getPreCastReposition(position, enemy.position);
+		if (reposition) return moveAction(reposition.x, reposition.y);
+
 		// Interrupt if enemy is casting (quick attack)
-		if (enemy.state === 'casting' && distance < interruptRange) 
+		if (enemy.status === 'casting' && distance < interruptRange) 
 		{
 			const castTime = getMissileCastTime(QUICK_CONFIG);
 			if (isSafeToAttack(threats, castTime)) 
 			{
-				return {
-					move,
-					startCast: {
-						spell: 'missile',
-						config: QUICK_CONFIG,
-						missileAI: StandardHoming,
-						direction: angleTo(state.position, enemy.position),
-					},
-				};
+				return missile(QUICK_CONFIG, StandardHoming, angleTo(position, enemy.position)).move(safeMove.x, safeMove.y);
 			}
 		}
 
@@ -381,15 +435,7 @@ export const Battlemage: WizardFunction = ({state}) =>
 			const heavyCastTime = getMissileCastTime(HEAVY_CONFIG);
 			if (isSafeToAttack(threats, heavyCastTime)) 
 			{
-				return {
-					move,
-					startCast: {
-						spell: 'missile',
-						config: HEAVY_CONFIG,
-						missileAI: StandardHoming,
-						direction: angleTo(state.position, enemy.position),
-					},
-				};
+				return missile(HEAVY_CONFIG, StandardHoming, angleTo(position, enemy.position)).move(safeMove.x, safeMove.y);
 			}
 
 			// Fallback: quick homing missile when heavy isn't safe (only if in range)
@@ -399,15 +445,7 @@ export const Battlemage: WizardFunction = ({state}) =>
         isSafeToAttack(threats, quickCastTime)
 			) 
 			{
-				return {
-					move,
-					startCast: {
-						spell: 'missile',
-						config: QUICK_CONFIG,
-						missileAI: StandardHoming,
-						direction: angleTo(state.position, enemy.position),
-					},
-				};
+				return missile(QUICK_CONFIG, StandardHoming, angleTo(position, enemy.position)).move(safeMove.x, safeMove.y);
 			}
 
 			// Not safe to attack — wait for threat to pass, then fire
@@ -416,18 +454,15 @@ export const Battlemage: 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);
+}