@vibemancer/core 0.1.3 → 0.1.5

package/src/bots/sniper/01_Spellshot.ts

@@ -1,10 +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} from '../../rules.js';
+import {RULES, ARENA_MIN, ARENA_MAX} from '../../rules.js';
 import {getMissileCastTime} from '../../utils/combat.js';
 import {
-	getThreats,
 	getMostUrgentThreat,
 	getDodgeDirectionForMovement,
 	isSafeToAttack,
@@ -12,13 +12,16 @@ import {
 	getBlinkToIncreaseDistance,
 	MIN_BLINK_ESCAPE_DISTANCE,
 	shouldForceShield,
+	keepOffWalls,
+	getPreCastReposition,
 } from '../shared.js';
 import {useParam} from '../../engine/params-runtime.js';
 
-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 WALL_BUFFER = 50;
 
@@ -36,12 +39,22 @@ function combatMove(
 	strafeCyclePeriod: number,
 	strafeIntensity: number,
 	approachSpeed: 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,
@@ -60,10 +73,10 @@ function combatMove(
 	}
 	// Priority 2: Avoid walls
 	else if (
-		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
 	) 
 	{
 		const futureClockwise = {
@@ -75,16 +88,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
@@ -101,35 +114,35 @@ 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 > maxDistance) 
+	if (currentDistance > maxDistance)
 	{
-		moveX += (deltaX / normalizedDistance) * approachSpeed;
-		moveY += (deltaY / normalizedDistance) * approachSpeed;
+		moveX += (approachDirX / approachMag) * approachSpeed;
+		moveY += (approachDirY / approachMag) * approachSpeed;
 	}
 	else if (currentDistance < minDistance) 
 	{
 		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};
@@ -163,34 +176,47 @@ function combatMove(
  *
  * TIER: 1 (base)
  */
-export const Spellshot: WizardFunction = ({state}) => 
+export function Spellshot(): FinalAction
 {
-	const dangerDistance = useParam('dangerDistance', 45, {range: 100, min: 0});
-	const targetDistance = useParam('targetDistance', 339, {
+	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 dangerDistance = useParam('dangerDistance', 99, {range: 100, min: 0});
+	const targetDistance = useParam('targetDistance', 310, {
 		range: 150,
 		min: 0,
 	});
-	const distanceDeadZone = useParam('distanceDeadZone', 22, {
+	const distanceDeadZone = useParam('distanceDeadZone', 81, {
 		range: 50,
 		min: 0,
 	});
 	const minCombatDistance = targetDistance - distanceDeadZone;
 	const maxCombatDistance = targetDistance + distanceDeadZone;
-	const strafeCyclePeriod = useParam('strafeCyclePeriod', 230, {
+	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.63, {
+		range: 0.4,
+		min: 0.2,
+		max: 1,
 		steps: 7,
 	});
-	const approachSpeed = useParam('approachSpeed', 78, {
-		range: 30,
-		min: 10,
-		max: 80,
+	const approachSpeed = useParam('approachSpeed', 0.73, {
+		range: 0.3,
+		min: 0.1,
+		max: 0.8,
 		steps: 7,
 	});
 	const shieldCancelThreshold = useParam('shieldCancelThreshold', 150, {
@@ -214,7 +240,7 @@ export const Spellshot: WizardFunction = ({state}) =>
 		range: 1.5,
 		steps: 5,
 	});
-	const missileMinDuration = useParam('missileMinDuration', 55, {
+	const missileMinDuration = useParam('missileMinDuration', 49, {
 		range: 30,
 		min: 20,
 		max: 100,
@@ -226,71 +252,88 @@ export const Spellshot: WizardFunction = ({state}) =>
 		max: 2.0,
 		steps: 5,
 	});
+	const centerBias = useParam('centerBias', 0.3, {
+		range: 0.4,
+		min: 0,
+		max: 0.8,
+		steps: 5,
+	});
+	const maxBlinkDistance = useParam('maxBlinkDistance', 300, {
+		range: 100,
+		min: 50,
+		max: 300,
+		steps: 7,
+	});
 
-	const enemy = state.enemies[0];
-	if (!enemy) 
+	const distance = distanceTo(position, enemy.position);
+
+	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') 
 	{
 		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 if dangerous threat will arrive before we can shield ===
 	// Only cancel for: high-damage homing (always) or undodgeable when health is at risk
 	if (
-		state.state === 'casting' &&
-    state.castingSpell === 'missile' &&
+		status === 'casting' &&
+    castingSpell === 'missile' &&
     urgentThreat &&
     (!urgentThreat.bestDodgeDirection || shouldForceShield(urgentThreat))
 	) 
 	{
 		const mustCancel =
 			shouldForceShield(urgentThreat) ||
-      state.health <= urgentThreat.projectile.damage * 2 + 1;
+      health <= urgentThreat.projectile.damage * 2 + 1;
 		if (mustCancel) 
 		{
 			const remainingCast =
-				(state.castDuration ?? 0) - (state.castProgress ?? 0);
+				((castProgressData?.total) ?? 0) - ((castProgressData?.current) ?? 0);
 			if (
 				urgentThreat.ticksToImpact <=
-        remainingCast + GCD_DURATION + SHIELD_CAST_TIME + 3
+        remainingCast + RULES.GCD_DURATION + RULES.SHIELD_CAST_TIME + 3
 			) 
 			{
-				const dodgeDir = getDodgeDirectionForMovement(threats, state.position);
+				const dodgeDir = getDodgeDirectionForMovement(threats, position);
 				const cancelMove = combatMove(
-					state.position,
+					position,
 					enemy,
 					distance,
 					minCombatDistance,
 					maxCombatDistance,
 					dodgeDir,
-					state.tick,
+					tick,
 					strafeCyclePeriod,
 					strafeIntensity,
 					approachSpeed,
+					centerBias,
 				);
-				return {move: cancelMove, cancel: true};
+				const safeCancelMove = keepOffWalls(position, cancelMove);
+				return cancel().move(safeCancelMove.x, safeCancelMove.y);
 			}
 		}
 	}
 
 	// === DEFENSE: Shield undodgeable or high-damage homing threats ===
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     urgentThreat &&
     (!urgentThreat.bestDodgeDirection || shouldForceShield(urgentThreat))
 	) 
@@ -300,63 +343,81 @@ export const Spellshot: WizardFunction = ({state}) =>
 			// Start shield at the right time (small buffer for safety)
 			if (urgentThreat.ticksToStartShield <= 3) 
 			{
-				return {
-					move: {x: 0, y: 0},
-					startCast: {spell: 'shield'},
-				};
+				return shield();
 			}
 		}
 		// Can't dodge, can't shield → blink away (emergency)
-		else if (state.blinkCooldown === 0) 
+		else if (blinkCooldown === 0)
 		{
-			return {
-				move: {x: 0, y: 0},
-				startCast: {spell: 'blink', target: getBlinkToCenter(state.position)},
-			};
+			const blinkTarget = capBlinkDistance(getBlinkToCenter(position));
+			return blink(blinkTarget.x, blinkTarget.y);
+		}
+	}
+
+	// === 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();
 		}
 	}
 
 	// === DISTANCE BLINK: enemy too close, blink to reestablish kiting range ===
 	if (
-		state.state === 'idle' &&
+		status === 'idle' &&
     distance < dangerDistance &&
-    state.blinkCooldown === 0 &&
+    blinkCooldown === 0 &&
     (!urgentThreat || urgentThreat.bestDodgeDirection !== null)
 	) 
 	{
 		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);
 		}
 	}
 
 	// Smart combat movement
-	const dodgeDirection = getDodgeDirectionForMovement(threats, state.position);
+	const dodgeDirection = getDodgeDirectionForMovement(threats, position);
 	const move = combatMove(
-		state.position,
+		position,
 		enemy,
 		distance,
 		minCombatDistance,
 		maxCombatDistance,
 		dodgeDirection,
-		state.tick,
+		tick,
 		strafeCyclePeriod,
 		strafeIntensity,
 		approachSpeed,
+		centerBias,
 	);
-
+	const safeMove = keepOffWalls(position, move);
 	// === OFFENSE: Fast homing missiles ===
-	if (state.state === 'idle' && distance < 600) 
+	if (status === 'idle' && distance < 600)
 	{
+		const reposition = getPreCastReposition(position, enemy.position);
+		if (reposition) return moveAction(reposition.x, reposition.y);
+
 		const missileConfig = {
 			damage: missileDamage,
 			speed: missileSpeed,
@@ -366,20 +427,12 @@ export const Spellshot: WizardFunction = ({state}) =>
 				Math.ceil((distance * durationRangeFactor) / missileSpeed),
 			),
 		};
-		const castTime = getMissileCastTime(missileConfig, state.lastMissileConfig);
+		const castTime = getMissileCastTime(missileConfig, lastMissileConfig);
 		if (isSafeToAttack(threats, castTime)) 
 		{
-			return {
-				move,
-				startCast: {
-					spell: 'missile',
-					config: missileConfig,
-					missileAI: HomingAI,
-					direction: angleTo(state.position, enemy.position),
-				},
-			};
+			return missile(missileConfig, HomingAI, angleTo(position, enemy.position)).move(safeMove.x, safeMove.y);
 		}
 	}
 
-	return {move};
-};
+	return moveAction(safeMove.x, safeMove.y);
+}