@vibemancer/core 0.1.3 → 0.1.5

package/src/bots/melee/01_Shadowblade.ts

@@ -1,18 +1,21 @@
-import {WizardFunction} from '../../types.js';
+import type {FinalAction} from '../../hooks/index.js';
+import {usePosition, useEnemy, useStatus, useBlinkCooldown, useTick, useThreats, useProjectiles, idle, move as moveAction, missile, shield, blink, cancel, flyStraight} from '../../hooks/index.js';
 import {distanceTo} from '../../utils/distance.js';
-import {ARENA_SIZE} from '../../rules.js';
+import {RULES, ARENA_MIN, ARENA_MAX} from '../../rules.js';
 import {
-	getThreats,
 	getMostUrgentThreat,
 	getDodgeDirectionForMovement,
 	getBlinkToDecreaseDistance,
 	shouldForceShield,
+	keepOffWalls,
+	getPreCastReposition,
 } from '../shared.js';
 import {useParam} from '../../engine/params-runtime.js';
 const WALL_BUFFER = 50;
 
 // Melee stab: 20 damage, speed 8, 3-hit kill.
-const STAB_CONFIG = {damage: 20, speed: 8, turnRate: 0, duration: 10};
+const STAB_SPEED = 8;
+const STAB_DURATION = 25;
 
 /**
  * Aggressive movement: dodge missiles using threat analysis, close distance, light strafe.
@@ -26,12 +29,22 @@ function aggressiveMove(
 	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,
@@ -48,10 +61,10 @@ function aggressiveMove(
 		strafeDirection = dodgeDirection;
 	}
 	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 = {
@@ -63,16 +76,16 @@ function aggressiveMove(
 			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
@@ -88,7 +101,7 @@ function aggressiveMove(
 	// When actively dodging, commit fully
 	if (dodgeDirection) 
 	{
-		return {x: strafeDirection.x * 100, y: strafeDirection.y * 100};
+		return {x: strafeDirection.x, y: strafeDirection.y};
 	}
 
 	// Light strafe + aggressive closing
@@ -96,14 +109,14 @@ function aggressiveMove(
 	let moveY = strafeDirection.y * strafeIntensity;
 
 	// Always close distance aggressively (melee wants to be in the enemy's face)
-	moveX += (deltaX / normalizedDistance) * approachSpeed;
-	moveY += (deltaY / normalizedDistance) * approachSpeed;
+	moveX += (approachDirX / approachMag) * approachSpeed;
+	moveY += (approachDirY / approachMag) * approachSpeed;
 
 	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};
@@ -124,29 +137,38 @@ function aggressiveMove(
  *
  * TIER: 1 (base)
  */
-export const Shadowblade: WizardFunction = ({state}) => 
+export function Shadowblade(): FinalAction
 {
-	const stabRange = useParam('stabRange', 76, {
+	const position = usePosition();
+	const enemy = useEnemy();
+	const status = useStatus();
+	const blinkCooldown = useBlinkCooldown();
+	const tick = useTick();
+	const threats = useThreats();
+	const projectiles = useProjectiles();
+
+
+	const stabRange = useParam('stabRange', 80, {
 		range: 30,
 		min: 20,
 		max: 80,
 		steps: 5,
 	});
-	const strafeCyclePeriod = useParam('strafeCyclePeriod', 252, {
+	const strafeCyclePeriod = useParam('strafeCyclePeriod', 282, {
 		range: 75,
 		min: 80,
 		max: 300,
 	});
-	const strafeIntensity = useParam('strafeIntensity', 55, {
-		range: 30,
-		min: 10,
-		max: 80,
+	const strafeIntensity = useParam('strafeIntensity', 0.15, {
+		range: 0.3,
+		min: 0.1,
+		max: 0.8,
 		steps: 7,
 	});
-	const approachSpeed = useParam('approachSpeed', 61, {
-		range: 20,
-		min: 50,
-		max: 100,
+	const approachSpeed = useParam('approachSpeed', 0.87, {
+		range: 0.2,
+		min: 0.5,
+		max: 1,
 		steps: 7,
 	});
 	const shieldCancelThreshold = useParam('shieldCancelThreshold', 150, {
@@ -154,35 +176,56 @@ export const Shadowblade: WizardFunction = ({state}) =>
 		min: 50,
 		max: 300,
 	});
-	const blinkWindowMax = useParam('blinkWindowMax', 23, {
+	const blinkWindowMax = useParam('blinkWindowMax', 51, {
 		range: 30,
 		min: 15,
 		max: 80,
 		steps: 7,
 	});
+	const stabDamage = Math.round(useParam('stabDamage', 25, {
+		range: 10,
+		min: 5,
+		max: 25,
+		steps: 7,
+	}));
+	const centerBias = useParam('centerBias', 0.8, {
+		range: 0.4,
+		min: 0,
+		max: 0.8,
+		steps: 5,
+	});
+	const maxBlinkDistance = useParam('maxBlinkDistance', 269, {
+		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);
-
-	const threats = getThreats(state);
 	const urgentThreat = getMostUrgentThreat(threats);
 
 	// Cancel shield if no longer needed
-	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();
 	}
 
-	if (state.state === 'idle') 
+	if (status === 'idle') 
 	{
 		// === BLINK: Dodge missile + close gap simultaneously (first priority) ===
 		// Wait until the missile is close (<=40 ticks) so the blink actually dodges it.
@@ -190,22 +233,20 @@ export const Shadowblade: WizardFunction = ({state}) =>
 		// blink cast won't complete in time.
 		if (
 			urgentThreat &&
-      state.blinkCooldown === 0 &&
+      blinkCooldown === 0 &&
       distance > stabRange &&
       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);
 		}
 
 		// Pre-stab shield: already at melee range, survival beats landing another stab.
@@ -218,23 +259,18 @@ export const Shadowblade: WizardFunction = ({state}) =>
       urgentThreat.ticksToStartShield <= 3
 		)
 		{
-			return {
-				move: {x: 0, y: 0},
-				startCast: {spell: 'shield'},
-			};
+			return shield();
 		}
 
+		// Pre-cast wall discipline: don't commit to a stab 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);
+
 		// Melee stab when close enough (offense over defense at melee range)
 		if (distance < stabRange)
 		{
-			return {
-				move: {x: 0, y: 0},
-				startCast: {
-					spell: 'missile',
-					config: STAB_CONFIG,
-					missileAI: () => ({}), // Non-homing, point blank
-				},
-			};
+			return missile({damage: stabDamage, speed: STAB_SPEED, turnRate: 0, duration: STAB_DURATION}, () => flyStraight(), 0).move(0, 0);
 		}
 
 		// === DEFENSE: Shield undodgeable threats (only when blink can't handle it) ===
@@ -244,27 +280,47 @@ export const Shadowblade: WizardFunction = ({state}) =>
       (!urgentThreat.bestDodgeDirection || shouldForceShield(urgentThreat)) &&
       urgentThreat.canBlockInTime &&
       urgentThreat.ticksToStartShield <= 3 &&
-      (state.blinkCooldown > 0 || urgentThreat.ticksToImpact < 10)
+      (blinkCooldown > 0 || urgentThreat.ticksToImpact < 10)
+		)
+		{
+			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 {
-				move: {x: 0, y: 0},
-				startCast: {spell: 'shield'},
-			};
+			return shield();
 		}
 	}
 
 	// Aggressive movement — always close distance
-	const dodgeDirection = getDodgeDirectionForMovement(threats, state.position);
+	const dodgeDirection = getDodgeDirectionForMovement(threats, position);
 	const move = aggressiveMove(
-		state.position,
+		position,
 		enemy,
 		distance,
 		dodgeDirection,
-		state.tick,
+		tick,
 		strafeCyclePeriod,
 		strafeIntensity,
 		approachSpeed,
+		centerBias,
 	);
-	return {move};
-};
+	const safeMove = keepOffWalls(position, move);
+	return moveAction(safeMove.x, safeMove.y);
+}