Android build v1.1.19

2026-07-04 20:50:33 -04:00
parent c052b086f8
commit bdae0007a1
16 changed files with 641 additions and 210 deletions
@@ -18,6 +18,7 @@ const CENTER_LEASH_BOSS_IDS = new Set(['great-jaggi', 'khezu'])
 const CENTER_LEASH_START_DISTANCE = 230
 const CENTER_LEASH_WALL_MARGIN = 96
 const CENTER_LEASH_EXTRA_DISTANCE = 36
+const PARTY_ARRIVAL_RADIUS = 3.5

 export function tickPartyMember(
  member: Iwt2PartyEntityState,
@@ -68,7 +69,7 @@ export function tickPartyMember(
  const canCast = member.aiRole === 'ranged'
    && attackCooldownRemaining <= 0
    && !!attackTarget
-    && canPartyMemberHitTarget({ ...member, attackCooldownRemaining, castSecondsRemaining }, attackTarget.position)
+    && canPartyMemberHitTarget({ ...member, attackCooldownRemaining, castSecondsRemaining }, attackTarget.position, attackTarget.radius)
  if (!dangerDestination && member.aiRole === 'ranged' && (member.castSecondsRemaining > 0 || canCast)) {
    const nextCastSecondsRemaining = member.castSecondsRemaining > 0
      ? castSecondsRemaining
@@ -76,7 +77,7 @@ export function tickPartyMember(
    return {
      ...member,
      velocity: { x: 0, y: 0 },
-      facing: withFallbackFacing(subtractVec2(attackTarget?.position ?? state.boss.position, member.position), member.facing),
+      facing: withFallbackFacing(subtractVec2(attackTarget?.position ?? getPrimaryBoss(state).position, member.position), member.facing),
      attackCooldownRemaining,
      castSecondsRemaining: nextCastSecondsRemaining,
      attackReady: member.castSecondsRemaining > 0 && nextCastSecondsRemaining <= 0,
@@ -85,15 +86,21 @@ export function tickPartyMember(
  }

  const decisionSecondsRemaining = Math.max(0, member.decisionSecondsRemaining - dt)
-  const desired = dangerDestination ?? getPartyDesiredPosition(member, state, decisionSecondsRemaining)
+  const desired = dangerDestination ?? getPartyDesiredPosition(member, state)
  const maxDistance = metadata.moveSpeed * dt
-  const position = clampVec2ToArena(moveToward(member.position, desired, maxDistance), member.radius, state.bounds)
-  const velocity = scaleVec2(subtractVec2(position, member.position), dt > 0 ? 1 / dt : 0)
+  const distanceToDesired = distanceVec2(member.position, desired)
+  const movingToDesired = distanceToDesired > PARTY_ARRIVAL_RADIUS
+  const position = movingToDesired
+    ? clampVec2ToArena(moveToward(member.position, desired, maxDistance), member.radius, state.bounds)
+    : member.position
+  const velocity = movingToDesired
+    ? scaleVec2(subtractVec2(position, member.position), dt > 0 ? 1 / dt : 0)
+    : { x: 0, y: 0 }
  return {
    ...member,
    position,
    velocity,
-    facing: withFallbackFacing(subtractVec2(attackTarget?.position ?? state.boss.position, position), member.facing),
+    facing: withFallbackFacing(subtractVec2(attackTarget?.position ?? getPrimaryBoss(state).position, position), member.facing),
    attackCooldownRemaining,
    castSecondsRemaining: 0,
    attackReady: false,
@@ -104,22 +111,21 @@ export function tickPartyMember(
  }
 }

-export function canPartyMemberHitTarget(member: Iwt2PartyEntityState, targetPosition: Iwt2Vec2): boolean {
+export function canPartyMemberHitTarget(member: Iwt2PartyEntityState, targetPosition: Iwt2Vec2, targetRadius = 0): boolean {
  if (member.health <= 0) return false
  if (member.status.stunnedSeconds > 0 || member.status.knockedDownSeconds > 0) return false
  const metadata = IWT2_CLASS_METADATA[member.classId]
  if (metadata.attackDamage <= 0) return false
-  return distanceVec2(member.position, targetPosition) <= metadata.attackRange + member.radius
+  return distanceVec2(member.position, targetPosition) <= metadata.attackRange + member.radius + targetRadius
 }

 function getPartyDesiredPosition(
  member: Iwt2PartyEntityState,
  state: Iwt2ArenaState,
-  decisionSecondsRemaining: number,
 ): Iwt2Vec2 {
-  const drift = decisionSecondsRemaining <= 0 ? decisionDrift(member, state.time) : { x: 0, y: 0 }
+  const drift = decisionDrift(member, state.time)
  const attackTarget = getPriorityAttackTarget(member, state)
-  const anchor = attackTarget?.position ?? state.boss.position
+  const anchor = attackTarget?.position ?? getPrimaryBoss(state).position
  const centerLeash = getTankCenterLeashPosition(member, state)
  if (centerLeash) return centerLeash
  return {
@@ -132,21 +138,22 @@ function getTankCenterLeashPosition(
  member: Iwt2PartyEntityState,
  state: Iwt2ArenaState,
 ): Iwt2Vec2 | null {
-  if (member.aiRole !== 'tank' || !CENTER_LEASH_BOSS_IDS.has(state.boss.bossId)) return null
+  const boss = getPrimaryBoss(state)
+  if (member.aiRole !== 'tank' || !CENTER_LEASH_BOSS_IDS.has(boss.bossId)) return null

  const center = arenaCenter(state)
-  const bossCenterDistance = distanceVec2(state.boss.position, center)
-  const nearWall = isBossNearWall(state)
+  const bossCenterDistance = distanceVec2(boss.position, center)
+  const nearWall = isBossNearWall(boss, state)
  if (!nearWall && bossCenterDistance < CENTER_LEASH_START_DISTANCE) return null

-  const bossMetadata = IWT2_BOSS_METADATA[state.boss.bossId]
-  const towardCenter = withFallbackFacing(subtractVec2(center, state.boss.position), {
-    x: state.boss.position.x < center.x ? 1 : -1,
-    y: state.boss.position.y < center.y ? 0.35 : -0.35,
+  const bossMetadata = IWT2_BOSS_METADATA[boss.bossId]
+  const towardCenter = withFallbackFacing(subtractVec2(center, boss.position), {
+    x: boss.position.x < center.x ? 1 : -1,
+    y: boss.position.y < center.y ? 0.35 : -0.35,
  })
-  const leashDistance = bossMetadata.meleeRange + state.boss.radius + member.radius + CENTER_LEASH_EXTRA_DISTANCE
+  const leashDistance = bossMetadata.meleeRange + boss.radius + member.radius + CENTER_LEASH_EXTRA_DISTANCE
  return clampVec2ToArena(
-    addVec2(state.boss.position, scaleVec2(towardCenter, leashDistance)),
+    addVec2(boss.position, scaleVec2(towardCenter, leashDistance)),
    member.radius,
    state.bounds,
  )
@@ -159,39 +166,41 @@ function arenaCenter(state: Iwt2ArenaState): Iwt2Vec2 {
  }
 }

-function isBossNearWall(state: Iwt2ArenaState): boolean {
-  const margin = state.boss.radius + CENTER_LEASH_WALL_MARGIN
+function isBossNearWall(boss: Iwt2ArenaState['boss'], state: Iwt2ArenaState): boolean {
+  const margin = boss.radius + CENTER_LEASH_WALL_MARGIN
  return (
-    state.boss.position.x <= margin
-    || state.boss.position.x >= state.bounds.width - margin
-    || state.boss.position.y <= margin
-    || state.boss.position.y >= state.bounds.height - margin
+    boss.position.x <= margin
+    || boss.position.x >= state.bounds.width - margin
+    || boss.position.y <= margin
+    || boss.position.y >= state.bounds.height - margin
  )
 }

 function getDangerAvoidancePosition(member: Iwt2PartyEntityState, state: Iwt2ArenaState): Iwt2Vec2 | null {
-  const boss = state.boss
  const hazardEscape = getHazardAvoidancePosition(member, state)
  if (hazardEscape) {
    return hazardEscape
  }

-  if (boss.bossId === 'bulldrome' && (boss.attackPhase === 'slamWindup' || boss.attackPhase === 'slamRecover')) {
-    const distance = distanceVec2(member.position, boss.position)
-    const dangerRadius = BULLDROME_BOSS_METADATA.slamRadius + member.radius + 34
-    if (distance < dangerRadius) {
-      const away = normalizeVec2(subtractVec2(member.position, boss.position))
-      return clampVec2ToArena(addVec2(member.position, scaleVec2(away, dangerRadius - distance + 40)), member.radius, state.bounds)
+  for (const boss of state.bosses) {
+    if (boss.health <= 0) continue
+    if (boss.bossId === 'bulldrome' && (boss.attackPhase === 'slamWindup' || boss.attackPhase === 'slamRecover')) {
+      const distance = distanceVec2(member.position, boss.position)
+      const dangerRadius = BULLDROME_BOSS_METADATA.slamRadius + member.radius + 34
+      if (distance < dangerRadius) {
+        const away = normalizeVec2(subtractVec2(member.position, boss.position))
+        return clampVec2ToArena(addVec2(member.position, scaleVec2(away, dangerRadius - distance + 40)), member.radius, state.bounds)
+      }
    }
-  }

-  if (boss.bossId === 'bulldrome' && (boss.attackPhase === 'chargeWindup' || boss.attackPhase === 'charging')) {
-    const danger = chargeDanger(member.position, state)
-    if (danger.inside || danger.ahead) {
-      const perpendicular = { x: -danger.direction.y, y: danger.direction.x }
-      const side = dotVec2(subtractVec2(member.position, boss.chargeStart), perpendicular) >= 0 ? 1 : -1
-      const escape = addVec2(member.position, scaleVec2(perpendicular, side * (boss.radius * 2.8 + member.radius)))
-      return clampVec2ToArena(escape, member.radius, state.bounds)
+    if (boss.bossId === 'bulldrome' && (boss.attackPhase === 'chargeWindup' || boss.attackPhase === 'charging')) {
+      const danger = chargeDanger(member.position, boss)
+      if (danger.inside || danger.ahead) {
+        const perpendicular = { x: -danger.direction.y, y: danger.direction.x }
+        const side = dotVec2(subtractVec2(member.position, boss.chargeStart), perpendicular) >= 0 ? 1 : -1
+        const escape = addVec2(member.position, scaleVec2(perpendicular, side * (boss.radius * 2.8 + member.radius)))
+        return clampVec2ToArena(escape, member.radius, state.bounds)
+      }
    }
  }

@@ -208,7 +217,7 @@ function getHazardAvoidancePosition(member: Iwt2PartyEntityState, state: Iwt2Are
    const dangerRadius = hazard.radius + member.radius + 46
    if (distance >= dangerRadius) continue

-    const fallback = withFallbackFacing(subtractVec2(member.position, state.boss.position), {
+    const fallback = withFallbackFacing(subtractVec2(member.position, getPrimaryBoss(state).position), {
      x: member.position.x < state.bounds.width * 0.5 ? -1 : 1,
      y: member.position.y < state.bounds.height * 0.5 ? -0.35 : 0.35,
    })
@@ -242,11 +251,14 @@ function getPriorityAttackTarget(
      distanceVec2(member.position, add.position) < distanceVec2(member.position, best.position) ? add : best
    ), livingAdds[0])
  }
-  return state.boss.health > 0 ? state.boss : undefined
+  const livingBosses = state.bosses.filter((boss) => boss.health > 0)
+  if (livingBosses.length === 0) return undefined
+  return livingBosses.reduce((best, boss) => (
+    distanceVec2(member.position, boss.position) < distanceVec2(member.position, best.position) ? boss : best
+  ), livingBosses[0])
 }

-function chargeDanger(position: Iwt2Vec2, state: Iwt2ArenaState) {
-  const boss = state.boss
+function chargeDanger(position: Iwt2Vec2, boss: Iwt2ArenaState['boss']) {
  const segment = subtractVec2(boss.chargeEnd, boss.chargeStart)
  const lengthSq = Math.max(1, lengthSqVec2(segment))
  const direction = normalizeVec2(segment)
@@ -262,6 +274,10 @@ function chargeDanger(position: Iwt2Vec2, state: Iwt2ArenaState) {
  }
 }

+function getPrimaryBoss(state: Iwt2ArenaState) {
+  return state.bosses.find((boss) => boss.health > 0) ?? state.bosses[0] ?? state.boss
+}
+
 function decisionDrift(member: Iwt2PartyEntityState, time: number): Iwt2Vec2 {
  const seed = member.id.length * 17
  return {