+
{IWT2_PARTY_ORDER.map((classId) => {
const metadata = IWT2_CLASS_METADATA[classId]
@@ -2372,6 +2364,39 @@ function activeUpgradeEntry(entries: Iwt2UpgradeNavEntry[], index: number) {
return entries[Math.min(index, entries.length - 1)]
}
+function moveHunterProfileSelection(
+ entries: Iwt2HunterProfileNavEntry[],
+ current: number,
+ action: InputAction,
+) {
+ if (!action.startsWith('navigate') || entries.length === 0) return current
+ const bounded = Math.min(current, entries.length - 1)
+ const active = entries[bounded]
+ if (!active) return 0
+ const candidates = entries
+ .map((entry, index) => ({ entry, index }))
+ .filter(({ index }) => index !== bounded)
+ .filter(({ entry }) => {
+ if (action === 'navigateLeft') return entry.column < active.column
+ if (action === 'navigateRight') return entry.column > active.column
+ if (action === 'navigateUp') return entry.row < active.row
+ return entry.row > active.row
+ })
+ if (candidates.length === 0) return bounded
+ candidates.sort((a, b) => {
+ const aPrimary = Math.abs(a.entry.row - active.row) + Math.abs(a.entry.column - active.column)
+ const bPrimary = Math.abs(b.entry.row - active.row) + Math.abs(b.entry.column - active.column)
+ const aSecondary = action === 'navigateLeft' || action === 'navigateRight'
+ ? Math.abs(a.entry.row - active.row)
+ : Math.abs(a.entry.column - active.column)
+ const bSecondary = action === 'navigateLeft' || action === 'navigateRight'
+ ? Math.abs(b.entry.row - active.row)
+ : Math.abs(b.entry.column - active.column)
+ return aPrimary - bPrimary || aSecondary - bSecondary || a.index - b.index
+ })
+ return candidates[0]?.index ?? bounded
+}
+
function upgradeEntryDisabled(entry: Iwt2UpgradeNavEntry) {
return entry.kind === 'upgradeContinue' && Boolean(entry.disabled)
}
diff --git a/src/modes/iwt2/sim/arena.ts b/src/modes/iwt2/sim/arena.ts
index d02b5d2..4d25760 100644
--- a/src/modes/iwt2/sim/arena.ts
+++ b/src/modes/iwt2/sim/arena.ts
@@ -9,6 +9,7 @@ import type {
Iwt2EntityId,
Iwt2GroundHazardState,
Iwt2HostileAddState,
+ Iwt2ArenaBounds,
Iwt2PartyAiRole,
Iwt2PartyEntityId,
Iwt2PartyEntityState,
@@ -66,14 +67,15 @@ export function createInitialIwt2ArenaState(
bossHealthScale = 1,
partyDamageTakenScale = 1,
roguelikePressure?: Iwt2RoguelikePressureState,
+ bounds: Iwt2ArenaBounds = { width: DEFAULT_ARENA_WIDTH, height: DEFAULT_ARENA_HEIGHT },
): Iwt2ArenaState {
const initialBossIds = bossIds?.length ? bossIds.slice(0, 2) : chooseInitialBossIds(bossId)
- const bosses = initialBossIds.map((id, index) => createBossEntity(id, index, bossHealthScale))
+ const bosses = initialBossIds.map((id, index) => createBossEntity(id, index, bossHealthScale, bounds))
return {
schemaVersion: 1,
time: 0,
- bounds: { width: DEFAULT_ARENA_WIDTH, height: DEFAULT_ARENA_HEIGHT },
- party: INITIAL_PARTY.map((member) => createPartyMember(member, partyDamageTakenScale)),
+ bounds,
+ party: INITIAL_PARTY.map((member) => createPartyMember(member, partyDamageTakenScale, bounds)),
projectiles: [],
hostileAdds: [],
hazards: [],
@@ -95,9 +97,9 @@ function chooseInitialBossIds(primaryBossId: Iwt2BossId): Iwt2BossId[] {
return [primaryBossId, random]
}
-function createBossEntity(bossId: Iwt2BossId, index: number, healthScale: number): Iwt2BossEntityState {
+function createBossEntity(bossId: Iwt2BossId, index: number, healthScale: number, bounds: Iwt2ArenaBounds): Iwt2BossEntityState {
const bossMetadata = IWT2_BOSS_METADATA[bossId]
- const position = initialBossPosition(index)
+ const position = scaleArenaPoint(initialBossPosition(index), bounds)
const maxHealth = Math.max(1, Math.round(bossMetadata.maxHealth * Math.max(0.01, healthScale)))
return {
id: bossId,
@@ -123,9 +125,9 @@ function createBossEntity(bossId: Iwt2BossId, index: number, healthScale: number
chargeHitEntityIds: [],
slamApplied: false,
wallContactSeconds: 0,
- relocateTarget: { x: DEFAULT_ARENA_WIDTH * 0.58, y: DEFAULT_ARENA_HEIGHT * 0.5 + (index === 0 ? -64 : 64) },
+ relocateTarget: scaleArenaPoint({ x: DEFAULT_ARENA_WIDTH * 0.58, y: DEFAULT_ARENA_HEIGHT * 0.5 + (index === 0 ? -64 : 64) }, bounds),
fireballCooldownRemaining: initialBossSecondaryCooldown(bossId) + index * 0.7,
- fireballTarget: { x: 320, y: 250 },
+ fireballTarget: scaleArenaPoint({ x: 320, y: 250 }, bounds),
birdWaveThresholdsTriggered: [],
mechanicLanes: [],
mechanicCircles: [],
@@ -141,6 +143,13 @@ function initialBossPosition(index: number) {
}
}
+function scaleArenaPoint(point: Iwt2Vec2, bounds: Iwt2ArenaBounds): Iwt2Vec2 {
+ return {
+ x: point.x * bounds.width / DEFAULT_ARENA_WIDTH,
+ y: point.y * bounds.height / DEFAULT_ARENA_HEIGHT,
+ }
+}
+
function initialBossSpecialCooldown(bossId: Iwt2BossId): number {
if (bossId === 'bulldrome') return 2
if (bossId === 'great-jaggi') return 2.4
@@ -324,7 +333,7 @@ function regeneratePartyMana(party: Iwt2PartyEntityState[], dt: number): Iwt2Par
})
}
-function createPartyMember(initial: InitialPartyMember, damageTakenScale: number): Iwt2PartyEntityState {
+function createPartyMember(initial: InitialPartyMember, damageTakenScale: number, bounds: Iwt2ArenaBounds): Iwt2PartyEntityState {
const metadata = IWT2_CLASS_METADATA[initial.classId]
const safeDamageTakenScale = Number.isFinite(damageTakenScale) ? Math.max(0.01, damageTakenScale) : 1
return {
@@ -332,7 +341,7 @@ function createPartyMember(initial: InitialPartyMember, damageTakenScale: number
kind: 'party',
classId: initial.classId,
aiRole: initial.aiRole,
- position: { x: initial.x, y: initial.y },
+ position: scaleArenaPoint({ x: initial.x, y: initial.y }, bounds),
velocity: { x: 0, y: 0 },
facing: { x: 1, y: 0 },
radius: metadata.radius,
@@ -355,7 +364,7 @@ function createPartyMember(initial: InitialPartyMember, damageTakenScale: number
attackReady: false,
status: createEmptyStatus(),
hotEffects: [],
- preferredOffset: { ...initial.preferredOffset },
+ preferredOffset: scaleArenaPoint(initial.preferredOffset, bounds),
decisionSecondsRemaining: initial.decisionOffset,
}
}
diff --git a/src/modes/iwt2/sim/arenaState.ts b/src/modes/iwt2/sim/arenaState.ts
index d462958..cd903c7 100644
--- a/src/modes/iwt2/sim/arenaState.ts
+++ b/src/modes/iwt2/sim/arenaState.ts
@@ -7,6 +7,7 @@ import {
import type {
Iwt2ArenaIndicator,
Iwt2ArenaInput,
+ Iwt2ArenaBounds,
Iwt2ArenaState as Iwt2CoreArenaState,
Iwt2BossEntityState,
Iwt2HostileAddState,
@@ -61,8 +62,9 @@ export function createInitialIwt2ArenaState(
bossHealthScale?: number,
partyDamageTakenScale?: number,
roguelikePressure?: Iwt2RoguelikePressureState,
+ bounds?: Iwt2ArenaBounds,
): Iwt2ArenaState {
- return decorateArenaState(createCoreIwt2ArenaState(bossId, bossIds, bossHealthScale, partyDamageTakenScale, roguelikePressure))
+ return decorateArenaState(createCoreIwt2ArenaState(bossId, bossIds, bossHealthScale, partyDamageTakenScale, roguelikePressure, bounds))
}
export function tickIwt2Arena(state: Iwt2ArenaState, input: Iwt2ArenaInput, dt: number): Iwt2ArenaState {
diff --git a/src/modes/iwt2/sim/roguelikePressure.ts b/src/modes/iwt2/sim/roguelikePressure.ts
index 9c33b4e..ac0a9cd 100644
--- a/src/modes/iwt2/sim/roguelikePressure.ts
+++ b/src/modes/iwt2/sim/roguelikePressure.ts
@@ -12,9 +12,11 @@ const ROGUELIKE_PRESSURE_INITIAL_STAGE_DAMAGE = 2
const ROGUELIKE_PRESSURE_SOURCE_ID = 'roguelike-pressure'
export function roguelikeIncomingDamageScale(
- _stage: number,
- _contentType: Iwt2RoguelikePressureContentType,
+ stage: number,
+ contentType: Iwt2RoguelikePressureContentType,
): number {
+ void stage
+ void contentType
return 1
}