Android build v1.0.35

2026-06-20 16:10:35 -04:00
parent 1281be69d8
commit 2300973164
15 changed files with 877 additions and 293 deletions
@@ -251,13 +251,13 @@ function outgoingHealMultiplier(debuffs: OpponentDebuffId[]) {
  return 0.85 ** buffStacks(debuffs, 'opp-healing-reduced')
 }

-function healAmount(member: PartyMember, amount: number, debuffs: OpponentDebuffId[]) {
+function healAmount(member: PartyMember, amount: number, debuffs: OpponentDebuffId[], multiplier = 1) {
  const healingReduction = member.healingReductionTicks && member.healingReductionTicks > 0 ? 0.75 : 1
-  return Math.round(amount * healingReduction * outgoingHealMultiplier(debuffs))
+  return Math.round(amount * healingReduction * outgoingHealMultiplier(debuffs) * multiplier)
 }

-function healMember(member: PartyMember, amount: number, debuffs: OpponentDebuffId[]) {
-  return clamp(member.health + healAmount(member, amount, debuffs), 0, effectiveMaxHealth(member))
+function healMember(member: PartyMember, amount: number, debuffs: OpponentDebuffId[], multiplier = 1) {
+  return clamp(member.health + healAmount(member, amount, debuffs, multiplier), 0, effectiveMaxHealth(member))
 }

 function cooldownMultiplier(spell: Spell, buffs: SelfBuffId[], debuffs: OpponentDebuffId[]) {
@@ -446,6 +446,7 @@ export function PvPRoguelikeScreen({
  const [cpuSide, setCpuSide] = useState<SideState>(() => starterSide(cpuPartyTemplate, maxResource))
  const [selectedId, setSelectedId] = useState(partyTemplate[0].id)
  const selectedIdRef = useRef(partyTemplate[0].id)
+  const [speedMultiplier, setSpeedMultiplier] = useState<1 | 2>(1)
  const [elapsedTicks, setElapsedTicks] = useState(0)
  const [cpuDifficulty, setCpuDifficulty] = useState<CpuDifficulty | null>(null)
  const [queueMessage, setQueueMessage] = useState('')
@@ -483,6 +484,14 @@ export function PvPRoguelikeScreen({
    ? Math.max(encountersCleared, encounterIndex + 1)
    : encountersCleared
  const cpuBehavior = cpuDifficulty ? CPU_BEHAVIOR[cpuDifficulty] : CPU_BEHAVIOR[1]
+  const activeSpellEffects = useMemo(
+    () => new Set(
+      gameClass.talents
+        .filter((talent) => talent.rank > 0)
+        .map((talent) => talent.effectType),
+    ),
+    [gameClass.talents],
+  )
  const playerDone = playerSide.enemyHealth <= 0
  const cpuDone = cpuSide.enemyHealth <= 0
  const playerAlive = playerSide.party.some((member) => member.health > 0)
@@ -677,6 +686,12 @@ export function PvPRoguelikeScreen({
    const extraTarget = (blockedIds: string[]) => livingTargets
      .filter((member) => !blockedIds.includes(member.id))
      .sort((left, right) => (left.health / left.maxHealth) - (right.health / right.maxHealth))[0]
+    const hasSpellEffect = (effectType: string) => sideName === 'player' && activeSpellEffects.has(effectType)
+    const renewEffect = starterSpells.find((candidate) => candidate.kind === 'hot')
+    const shieldEffect = starterSpells.find((candidate) => candidate.kind === 'shield')
+    const radianceEffect = starterSpells.find((candidate) => candidate.kind === 'group')
+    const healingMultiplier = (member: PartyMember) =>
+      hasSpellEffect('shielded_healing_bonus') && member.shield > 0 ? 1.2 : 1
    const directTargets = new Set([targetId])
    const hotTargets = new Set(spell.kind === 'hot' ? [targetId] : [])
    const shieldTargets = new Set(spell.kind === 'shield' ? [targetId] : [])
@@ -701,22 +716,45 @@ export function PvPRoguelikeScreen({
      const extra = extraTarget([...directTargets])
      if (extra) directTargets.add(extra.id)
    }
+    if (spell.kind === 'direct' && hasSpellEffect('mend_applies_renew') && renewEffect) {
+      directTargets.forEach((id) => hotTargets.add(id))
+    }
+    if (spell.kind === 'direct' && hasSpellEffect('mend_applies_shield') && shieldEffect) {
+      directTargets.forEach((id) => shieldTargets.add(id))
+    }
+    if (spell.kind === 'shield' && hasSpellEffect('shield_applies_renew') && renewEffect) {
+      shieldTargets.forEach((id) => hotTargets.add(id))
+    }
    const nextParty = current.party.map((member) => {
      if (member.health <= 0) return member
      if (spell.kind === 'group') {
        if (!groupTargets.has(member.id)) return member
        const groupPower = Math.round(spell.power * (1.25 ** buffStacks(buffs, 'group-heal-boost')))
-        const nextHealth = healMember(member, groupPower, debuffs)
+        const nextHealth = healMember(member, groupPower, debuffs, healingMultiplier(member))
        addFloatingHeal(sideName, member.id, Math.max(0, nextHealth - member.health))
-        return { ...member, health: nextHealth }
+        const nextShield = hasSpellEffect('radiance_applies_shield')
+          ? Math.max(member.shield, Math.round((shieldEffect?.power ?? spell.power) * 0.3))
+          : member.shield
+        return {
+          ...member,
+          health: nextHealth,
+          shield: nextShield,
+          hotTicks: hasSpellEffect('radiance_applies_renew') && renewEffect
+            ? Math.max(member.hotTicks, 3)
+            : member.hotTicks,
+        }
      }
      if (!directTargets.has(member.id) && !hotTargets.has(member.id) && !shieldTargets.has(member.id)) return member
      if (spell.kind === 'shield') {
        const shieldPower = Math.round(spell.power * (1.25 ** buffStacks(buffs, 'shield-boost')))
-        return { ...member, shield: Math.max(member.shield, shieldPower) }
+        return {
+          ...member,
+          shield: Math.max(member.shield, shieldPower),
+          hotTicks: hotTargets.has(member.id) ? 5 : member.hotTicks,
+        }
      }
      if (spell.kind === 'cleanse') {
-        const nextHealth = healMember(member, spell.power, debuffs)
+        const nextHealth = healMember(member, spell.power, debuffs, healingMultiplier(member))
        addFloatingHeal(sideName, member.id, Math.max(0, nextHealth - member.health))
        return {
          ...member,
@@ -728,11 +766,17 @@ export function PvPRoguelikeScreen({
          healingReductionTicks: undefined,
        }
      }
-      const nextHealth = directTargets.has(member.id) ? healMember(member, spell.power, debuffs) : member.health
+      const nextHealth = directTargets.has(member.id)
+        ? healMember(member, spell.power, debuffs, healingMultiplier(member))
+        : member.health
      if (nextHealth > member.health) addFloatingHeal(sideName, member.id, nextHealth - member.health)
+      const nextShield = shieldTargets.has(member.id) && spell.kind === 'direct' && hasSpellEffect('mend_applies_shield')
+        ? Math.max(member.shield, Math.round((shieldEffect?.power ?? spell.power) * 0.5))
+        : member.shield
      return {
        ...member,
        health: nextHealth,
+        shield: nextShield,
        hotTicks: hotTargets.has(member.id) ? 5 : member.hotTicks,
      }
    })
@@ -746,20 +790,24 @@ export function PvPRoguelikeScreen({
          : current.castsTowardFree + 1
      : current.castsTowardFree
    const gainedFreeCast = freeCastStacks > 0 && !current.freeCastReady && current.castsTowardFree + 1 >= 5
+    const nextCooldowns = {
+      ...current.cooldowns,
+    }
+    if (spell.kind === 'direct' && hasSpellEffect('mend_reduces_radiance_cooldown') && radianceEffect) {
+      nextCooldowns[radianceEffect.id] = Math.max(0, (nextCooldowns[radianceEffect.id] ?? 0) - 2)
+    }
+    nextCooldowns[spell.id] = spell.cooldown * cooldownMultiplier(spell, buffs, debuffs)
    const nextState: SideState = {
      ...current,
      party: nextParty,
      resource: current.resource - effectiveCost,
-      cooldowns: {
-        ...current.cooldowns,
-        [spell.id]: spell.cooldown * cooldownMultiplier(spell, buffs, debuffs),
-      },
+      cooldowns: nextCooldowns,
      castsTowardFree: nextCastsTowardFree,
      freeCastReady: gainedFreeCast || nextFreeCastReady,
    }
    setCurrent(nextState)
    return true
-  }, [addFloatingHeal])
+  }, [activeSpellEffects, addFloatingHeal, starterSpells])

  const castPlayerSpell = useCallback((spell: Spell) => {
    if (status !== 'playing' || playerDone || !playerAlive) return
@@ -867,6 +915,7 @@ export function PvPRoguelikeScreen({
    const appliesHealingReduction = encounterValue.isBoss && elapsedTicks > 0 && elapsedTicks % 9 === 0 && mechanics.includes('healing-reduction')
    const appliesPoison = encounterValue.isBoss && elapsedTicks > 0 && elapsedTicks % 12 === 0 && mechanics.includes('ramping-poison')
    const damageMultiplier = incomingDamageMultiplier(side.debuffs)
+    const hasSpellEffect = (effectType: string) => sideName === 'player' && activeSpellEffects.has(effectType)
    const tankPressure = tankPressureTargets(side.party)
    const tankPressureIds = new Set(tankPressure.targets.map((member) => member.id))
    const nextParty = side.party.map((member) => {
@@ -882,8 +931,12 @@ export function PvPRoguelikeScreen({
        : member.poisonStacks ?? 0
      if (nextPoisonStacks > 0) damage += 3 + nextPoisonStacks * 3
      damage = Math.round(damage * damageMultiplier)
+      if (member.shield > 0 && hasSpellEffect('shielded_damage_reduction')) {
+        damage = Math.round(damage * 0.8)
+      }
      const absorbed = Math.min(member.shield, damage)
-      const healing = member.hotTicks > 0 ? healAmount(member, 6, side.debuffs) : 0
+      const healingMultiplier = member.shield > 0 && hasSpellEffect('shielded_healing_bonus') ? 1.2 : 1
+      const healing = member.hotTicks > 0 ? healAmount(member, 6, side.debuffs, healingMultiplier) : 0
      if (healing > 0) addFloatingHeal(sideName, member.id, healing)
      const nextMaxHealthPenaltyTicks = appliesMaxHealthCut && member.id === primaryTarget.id
        ? 14
@@ -925,7 +978,7 @@ export function PvPRoguelikeScreen({
      ),
      enemyHealth: Math.max(0, side.enemyHealth - partyDamageOutput(nextParty, encounterValue.partyDamage)),
    }
-  }, [addFloatingHeal, elapsedTicks, maxResource])
+  }, [activeSpellEffects, addFloatingHeal, elapsedTicks, maxResource])

  const beginUpgradePhase = useCallback(() => {
    setPlayerBuffChoices(chooseRandom(selfBuffChoicesCatalog, 3))
@@ -985,9 +1038,9 @@ export function PvPRoguelikeScreen({
        addLog(`${encounter.enemyName} cleared. Choose your next edge.`, 'loot')
        beginUpgradePhase()
      }
-    }, TICK_MS)
+    }, TICK_MS / speedMultiplier)
    return () => window.clearInterval(timer)
-  }, [addLog, advanceSide, awardBossReward, beginUpgradePhase, checkpointStage, contentType, cpuDifficulty, cpuTakeTurn, encounter, encounterIndex, encountersCleared, finishRoguelikeRun, paused, profile.character.id, stage, status])
+  }, [addLog, advanceSide, awardBossReward, beginUpgradePhase, checkpointStage, contentType, cpuDifficulty, cpuTakeTurn, encounter, encounterIndex, encountersCleared, finishRoguelikeRun, paused, profile.character.id, speedMultiplier, stage, status])

  useEffect(() => {
    if ((status !== 'won' && status !== 'lost') || recordedRunRef.current || !cpuDifficulty) return
@@ -1104,6 +1157,10 @@ export function PvPRoguelikeScreen({
  }, [addLog, contentType, cpuDifficulty, encounter, encounterIndex, encounterPool, encounters, finishRoguelikeRun, maxResource, opponentDebuffChoicesCatalog, selectedBuff, selectedDebuff, selfBuffChoicesCatalog, stage, starterSpells])

  useGameAction((action) => {
+    if (action === 'toggleSpeed') {
+      if (status === 'playing') setSpeedMultiplier((value) => (value === 1 ? 2 : 1))
+      return
+    }
    if (action === 'pause' || action === 'back') {
      if (status === 'playing') setPaused((value) => !value)
      return
@@ -1175,6 +1232,7 @@ export function PvPRoguelikeScreen({
    directPartyTargeting,
    paused,
    targetGroup,
+    speedMultiplier,
  }), [
    bindings,
    controllerIconStyle,
@@ -1199,6 +1257,7 @@ export function PvPRoguelikeScreen({
    playerSide.party,
    playerSide.resource,
    selectedId,
+    speedMultiplier,
    stage,
    starterSpells,
    status,
@@ -1237,6 +1296,7 @@ export function PvPRoguelikeScreen({
                <div className="resource-row pvp-resource-row">
                  <div className="pvp-resource-wrap">
                    <span>{gameClass.resourceName} {Math.floor(playerSide.resource)} / {maxResource}</span>
+                    {speedMultiplier === 2 && <strong className="speed-badge">2x speed</strong>}
                    <div className="bar mana-bar"><span style={{ width: `${(playerSide.resource / maxResource) * 100}%` }} /></div>
                  </div>
                </div>