Android build v1.0.57

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.warren.iwanttoheal"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 74
+        versionCode 76
-        versionName "1.0.55"
+        versionName "1.0.57"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

server/game-api.mjs

@@ -2307,7 +2307,10 @@ function completeRoguelike(database, characterId, accountId, runMetrics) {
   const bossesCleared = Number(runMetrics?.bossesCleared ?? Math.floor(encountersCleared / 3))
   const experienceMode = runMetrics?.experienceMode === 'pvp-boss-quarter-level'
     ? 'pvp-boss-quarter-level'
+    : runMetrics?.experienceMode === 'pvp-fight-twelfth-level'
+      ? 'pvp-fight-twelfth-level'
       : 'default'
+  const fightsCleared = Number(runMetrics?.fightsCleared ?? encountersCleared)
   const resourceSpent = Number(runMetrics?.resourceSpent)
   const durationSeconds = Number(runMetrics?.durationSeconds)
   if (!Number.isInteger(dungeonId) || dungeonId < 1) {
@@ -2322,6 +2325,9 @@ function completeRoguelike(database, characterId, accountId, runMetrics) {
   if (!Number.isInteger(bossesCleared) || bossesCleared < 0 || bossesCleared > 100000) {
     throw new Error('The roguelike boss total is invalid.')
   }
+  if (!Number.isInteger(fightsCleared) || fightsCleared < 0 || fightsCleared > 100000) {
+    throw new Error('The roguelike fight total is invalid.')
+  }
   if (!Number.isInteger(resourceSpent) || resourceSpent < 0 || resourceSpent > 100000) {
     throw new Error('The run resource total is invalid.')
   }
@@ -2374,14 +2380,15 @@ function completeRoguelike(database, characterId, accountId, runMetrics) {
   `).get(maxLevel).experienceRequired
   let newExperience = character.experience
   let newLevel = character.level
-  if (experienceMode === 'pvp-boss-quarter-level') {
+  if (experienceMode === 'pvp-boss-quarter-level' || experienceMode === 'pvp-fight-twelfth-level') {
     const catchUpTargetLevel = database.prepare(`
       SELECT COALESCE(MAX(level), 0) AS level
       FROM characters
       WHERE account_id = ?
         AND id != ?
     `).get(accountId, characterId).level
-    for (let bossIndex = 0; bossIndex < bossesCleared && newExperience < maxExperience; bossIndex += 1) {
+    const rewardUnits = experienceMode === 'pvp-boss-quarter-level' ? bossesCleared : fightsCleared
+    for (let rewardIndex = 0; rewardIndex < rewardUnits && newExperience < maxExperience; rewardIndex += 1) {
       const currentLevelFloor = database.prepare(`
         SELECT experience_required AS experienceRequired
         FROM level_progression
@@ -2395,7 +2402,9 @@ function completeRoguelike(database, characterId, accountId, runMetrics) {
           WHERE level = ?
         `).get(newLevel + 1).experienceRequired
       const levelBand = Math.max(1, nextLevelExperience - currentLevelFloor)
-      const rewardRate = catchUpTargetLevel > newLevel ? 0.5 : 0.25
+      const rewardRate = experienceMode === 'pvp-boss-quarter-level'
+        ? (catchUpTargetLevel > newLevel ? 0.5 : 0.25)
+        : (catchUpTargetLevel > newLevel ? 1 / 6 : 1 / 12)
       newExperience = Math.min(maxExperience, newExperience + Math.round(levelBand * rewardRate))
       newLevel = database.prepare(`
         SELECT MAX(level) AS level

src/App.css

@@ -5888,6 +5888,33 @@ h2 {
   z-index: 10;
 }
 
+.pvp-round-countdown {
+  align-items: center;
+  background: rgba(5, 5, 8, 0.55);
+  display: flex;
+  inset: 0;
+  justify-content: center;
+  position: fixed;
+  z-index: 9;
+}
+
+.pvp-round-countdown > div {
+  background: var(--panel);
+  border: 3px solid #0b0c0f;
+  box-shadow: 8px 8px 0 #050507;
+  min-width: 220px;
+  outline: 2px solid var(--gold);
+  padding: 28px;
+  text-align: center;
+}
+
+.pvp-round-countdown h2 {
+  color: var(--gold);
+  font-size: clamp(48px, 8vw, 92px);
+  line-height: 1;
+  margin-top: 8px;
+}
+
 .result-screen > div,
 .pause-screen > div {
   background: var(--panel);

src/components/PvpRoguelikeScreen.tsx

@@ -42,7 +42,8 @@ import {
 } from '../pvpRoguelike'
 
 const TICK_MS = 700
-const UPGRADE_CHOICE_SECONDS = 10
+const ROUND_START_SECONDS = 3
+const UPGRADE_CHOICE_SECONDS = 15
 
 type BossMechanic =
   | 'party-pulse'
@@ -57,24 +58,18 @@ type PvpEncounter = DungeonEncounter & {
 }
 
 type SlotKey = '1' | '2' | '3' | '4' | '5' | '6'
+type DraftSlotKey = Exclude<SlotKey, '6'>
 type AbilityLabelMode = 'ability' | 'slot'
 
 type SelfBuffId =
-  | `slot${SlotKey}-extra-target`
+  | 'revive-party-members'
-  | `slot${SlotKey}-cost-down`
+  | `slot${DraftSlotKey}-extra-target`
-  | `slot${SlotKey}-cooldown-down`
+  | `slot${DraftSlotKey}-cost-down`
-  | 'fifth-cast-free'
+  | `slot${DraftSlotKey}-cooldown-down`
-  | 'group-heal-boost'
-  | 'shield-boost'
 
 type OpponentDebuffId =
-  | `opp-slot${SlotKey}-cost-up`
+  | `opp-slot${DraftSlotKey}-cost-up`
-  | `opp-slot${SlotKey}-cooldown-up`
+  | `opp-slot${DraftSlotKey}-cooldown-up`
-  | 'opp-takes-more-damage'
-  | 'opp-healing-reduced'
-  | 'opp-resource-regen-down'
-  | 'opp-cleanse-cooldown-up'
-  | 'opp-purge-random-buff'
 
 type Choice<T extends string> = {
   id: T
@@ -119,6 +114,12 @@ type LivePvpMatch = {
   opponentClassName: string
 }
 
+const REVIVE_PARTY_CHOICE: Choice<SelfBuffId> = {
+  id: 'revive-party-members',
+  name: 'Revive Party Members',
+  description: 'Revive fallen party members before the next fight.',
+}
+
 const BOSS_MECHANICS: BossMechanic[] = [
   'party-pulse',
   'searing-mark',
@@ -184,7 +185,7 @@ function slotLabel(slot: SlotKey, spells: Spell[], labelMode: AbilityLabelMode)
 }
 
 function buildSelfBuffChoices(spells: Spell[], labelMode: AbilityLabelMode): Array<Choice<SelfBuffId>> {
-  const slotChoices = (['1', '2', '3', '4', '5', '6'] as SlotKey[]).flatMap((slot) => {
+  return (['1', '2', '3', '4', '5'] as DraftSlotKey[]).flatMap((slot) => {
     const label = slotLabel(slot, spells, labelMode)
     return [
       {
@@ -204,16 +205,10 @@ function buildSelfBuffChoices(spells: Spell[], labelMode: AbilityLabelMode): Arr
       },
     ]
   })
-  return [
-    ...slotChoices,
-    { id: 'fifth-cast-free', name: 'Stored Momentum', description: 'After 5 casts, the next cast is free.' },
-    { id: 'group-heal-boost', name: 'Wide Radiance', description: 'Party healing is 25% stronger.' },
-    { id: 'shield-boost', name: 'Dense Shields', description: 'Shield absorbs are 25% stronger.' },
-  ]
 }
 
 function buildOpponentDebuffChoices(spells: Spell[], labelMode: AbilityLabelMode): Array<Choice<OpponentDebuffId>> {
-  const slotChoices = (['1', '2', '3', '4', '5', '6'] as SlotKey[]).flatMap((slot) => {
+  return (['1', '2', '3', '4', '5'] as DraftSlotKey[]).flatMap((slot) => {
     const label = slotLabel(slot, spells, labelMode)
     return [
       {
@@ -228,14 +223,6 @@ function buildOpponentDebuffChoices(spells: Spell[], labelMode: AbilityLabelMode
       },
     ]
   })
-  return [
-    ...slotChoices,
-    { id: 'opp-takes-more-damage', name: 'Expose Weakness', description: 'Opponent takes 10% more damage.' },
-    { id: 'opp-healing-reduced', name: 'Blunted Recovery', description: 'Opponent healing is 15% weaker.' },
-    { id: 'opp-resource-regen-down', name: 'Mana Squeeze', description: 'Opponent resource regeneration is reduced by 25%.' },
-    { id: 'opp-cleanse-cooldown-up', name: 'Lingering Toxins', description: 'Opponent cleanse cooldown is 25% longer.' },
-    { id: 'opp-purge-random-buff', name: 'Strip Momentum', description: 'Remove 1 random buff from the opponent immediately.' },
-  ]
 }
 
 function toCombatSpell(ability: Ability, key: string): Spell {
@@ -263,17 +250,10 @@ function effectiveMaxHealth(member: PartyMember) {
   return Math.max(1, Math.round(member.maxHealth * (member.maxHealthPenaltyTicks && member.maxHealthPenaltyTicks > 0 ? 0.75 : 1)))
 }
 
-function incomingDamageMultiplier(debuffs: OpponentDebuffId[]) {
-  return 1.1 ** buffStacks(debuffs, 'opp-takes-more-damage')
-}
-
-function outgoingHealMultiplier(debuffs: OpponentDebuffId[]) {
-  return 0.85 ** buffStacks(debuffs, 'opp-healing-reduced')
-}
-
 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) * multiplier)
+  void debuffs
+  return Math.round(amount * healingReduction * multiplier)
 }
 
 function healMember(member: PartyMember, amount: number, debuffs: OpponentDebuffId[], multiplier = 1) {
@@ -284,8 +264,7 @@ function cooldownMultiplier(spell: Spell, buffs: SelfBuffId[], debuffs: Opponent
   const slot = spell.key as SlotKey
   const downStacks = buffStacks(buffs, `slot${slot}-cooldown-down` as SelfBuffId)
   const upStacks = buffStacks(debuffs, `opp-slot${slot}-cooldown-up` as OpponentDebuffId)
-  const cleansePenalty = spell.kind === 'cleanse' ? buffStacks(debuffs, 'opp-cleanse-cooldown-up') : 0
+  return (0.75 ** downStacks) * (1.25 ** upStacks)
-  return (0.75 ** downStacks) * (1.25 ** (upStacks + cleansePenalty))
 }
 
 function spellResourceCost(spell: Spell, buffs: SelfBuffId[], debuffs: OpponentDebuffId[], freeCastReady: boolean) {
@@ -293,7 +272,8 @@ function spellResourceCost(spell: Spell, buffs: SelfBuffId[], debuffs: OpponentD
   const downStacks = buffStacks(buffs, `slot${slot}-cost-down` as SelfBuffId)
   const upStacks = buffStacks(debuffs, `opp-slot${slot}-cost-up` as OpponentDebuffId)
   const adjustedCost = Math.ceil(spell.cost * (0.75 ** downStacks) * (1.25 ** upStacks))
-  return freeCastReady && buffStacks(buffs, 'fifth-cast-free') > 0 ? 0 : adjustedCost
+  void freeCastReady
+  return adjustedCost
 }
 
 function buildEncounterSegment(pool: DungeonEncounter[], stage: number, kind: PvpContentType): PvpEncounter[] {
@@ -350,10 +330,32 @@ function starterSide(partyTemplate: PartyMember[], maxResource: number): SideSta
   }
 }
 
+function hasDeadPartyMembers(side: SideState) {
+  return side.party.some((member) => member.health <= 0)
+}
+
+function recoverPartyForNextEncounter(party: PartyMember[], reviveDead: boolean) {
+  return party.map((member) => ({
+    ...member,
+    health: member.health <= 0
+      ? (reviveDead ? Math.max(1, Math.round(member.maxHealth * 0.3)) : 0)
+      : clamp(member.health + Math.round(member.maxHealth * 0.3), 0, member.maxHealth),
+    debuff: undefined,
+    debuffTicks: undefined,
+    poisonStacks: undefined,
+    maxHealthPenaltyTicks: undefined,
+    healingReductionTicks: undefined,
+  }))
+}
+
+function removeRandomDebuff(debuffs: OpponentDebuffId[]) {
+  if (debuffs.length === 0) return debuffs
+  const removedIndex = Math.floor(Math.random() * debuffs.length)
+  return debuffs.filter((_, index) => index !== removedIndex)
+}
+
 function scoreSelfBuff(buff: Choice<SelfBuffId>, spells: Spell[]) {
-  if (buff.id === 'fifth-cast-free') return 8
+  if (buff.id === 'revive-party-members') return 10
-  if (buff.id === 'group-heal-boost') return 8
-  if (buff.id === 'shield-boost') return 6
   const slot = buff.id.match(/slot([1-6])/i)?.[1] as SlotKey | undefined
   const spell = spells.find((candidate) => candidate.key === slot)
   if (!spell) return 5
@@ -367,11 +369,7 @@ function scoreSelfBuff(buff: Choice<SelfBuffId>, spells: Spell[]) {
 }
 
 function scoreDebuff(debuff: Choice<OpponentDebuffId>, opponentBuffCount: number) {
-  if (debuff.id === 'opp-takes-more-damage') return 9
+  void opponentBuffCount
-  if (debuff.id === 'opp-healing-reduced') return 8
-  if (debuff.id === 'opp-resource-regen-down') return 7
-  if (debuff.id === 'opp-cleanse-cooldown-up') return 5
-  if (debuff.id === 'opp-purge-random-buff') return opponentBuffCount > 0 ? 8 : 2
   if (debuff.id.endsWith('cost-up')) return 7
   return 6
 }
@@ -388,13 +386,6 @@ function selectCpuChoice<T extends string>(
   return ranked[0]
 }
 
-function removeRandomBuff(side: SideState) {
-  if (side.buffs.length === 0) return side
-  const nextBuffs = [...side.buffs]
-  nextBuffs.splice(Math.floor(Math.random() * nextBuffs.length), 1)
-  return { ...side, buffs: nextBuffs }
-}
-
 function createLogEntry(nextLogId: { current: number }, text: string, tone: CombatLogEntry['tone']) {
   return { id: nextLogId.current++, text, tone }
 }
@@ -458,7 +449,7 @@ export function PvPRoguelikeScreen({
     })),
     [contentType],
   )
-  const [status, setStatus] = useState<'queueing' | 'playing' | 'upgrade-choice' | 'won' | 'lost'>('queueing')
+  const [status, setStatus] = useState<'queueing' | 'round-countdown' | 'playing' | 'upgrade-choice' | 'won' | 'lost'>('queueing')
   const [stage, setStage] = useState(startStage)
   const [encounters, setEncounters] = useState<PvpEncounter[]>(() => buildEncounterSegment(encounterPool, startStage, contentType))
   const [encounterIndex, setEncounterIndex] = useState(0)
@@ -484,6 +475,7 @@ export function PvPRoguelikeScreen({
   const [playerDebuffChoices, setPlayerDebuffChoices] = useState<Array<Choice<OpponentDebuffId>>>([])
   const [selectedBuff, setSelectedBuff] = useState<Choice<SelfBuffId> | null>(null)
   const [selectedDebuff, setSelectedDebuff] = useState<Choice<OpponentDebuffId> | null>(null)
+  const [roundCountdown, setRoundCountdown] = useState(ROUND_START_SECONDS)
   const [upgradeTimeLeft, setUpgradeTimeLeft] = useState(UPGRADE_CHOICE_SECONDS)
   const [encountersCleared, setEncountersCleared] = useState(0)
   const [paused, setPaused] = useState(false)
@@ -498,6 +490,7 @@ export function PvPRoguelikeScreen({
   const queuedMatchRef = useRef(false)
   const upgradeChoiceEndsAtRef = useRef(0)
   const autoSubmittedUpgradeRef = useRef(false)
+  const roundCountdownTimerRef = useRef<number | null>(null)
   const liveMatchRef = useRef<LivePvpMatch | null>(null)
   const loggedOpponentDoneRef = useRef(false)
   const pendingLiveUpgradeRef = useRef<{
@@ -560,6 +553,29 @@ export function PvPRoguelikeScreen({
     }, 900)
   }, [])
 
+  const clearRoundCountdown = useCallback(() => {
+    if (roundCountdownTimerRef.current === null) return
+    window.clearInterval(roundCountdownTimerRef.current)
+    roundCountdownTimerRef.current = null
+  }, [])
+
+  const beginRoundCountdown = useCallback((message?: string) => {
+    clearRoundCountdown()
+    setRoundCountdown(ROUND_START_SECONDS)
+    setStatus('round-countdown')
+    if (message) addLog(message, 'system')
+    const startedAt = Date.now()
+    roundCountdownTimerRef.current = window.setInterval(() => {
+      const remaining = Math.max(0, ROUND_START_SECONDS - (Date.now() - startedAt) / 1000)
+      setRoundCountdown(remaining)
+      if (remaining > 0) return
+      clearRoundCountdown()
+      setStatus((current) => current === 'round-countdown' ? 'playing' : current)
+    }, 100)
+  }, [addLog, clearRoundCountdown])
+
+  useEffect(() => () => clearRoundCountdown(), [clearRoundCountdown])
+
   useEffect(() => {
     if (queuedMatchRef.current) return
     const loadedCheckpoint = loadPvpRoguelikeCheckpoint(profile.character.id, contentType)
@@ -571,10 +587,11 @@ export function PvPRoguelikeScreen({
     encounterPoolRef.current = encounterPool
   }, [encounterPool])
 
-  const awardBossReward = useCallback((encounterIndexValue: number) => {
+  const awardEncounterReward = useCallback((encounterIndexValue: number) => {
     if (bossRewardClaimedRef.current.has(encounterIndexValue)) return
     bossRewardClaimedRef.current.add(encounterIndexValue)
     const rewardEncounter = encounters[encounterIndexValue]
+    const isBossReward = Boolean(rewardEncounter?.isBoss)
     completeRoguelike(
       rewardDungeon.id,
       rewardDifficulty.id,
@@ -582,10 +599,11 @@ export function PvPRoguelikeScreen({
       0,
       Math.max(1, Math.round((elapsedTicks * TICK_MS) / 1000)),
       {
-        bossesCleared: 1,
+        bossesCleared: isBossReward ? 1 : 0,
-        experienceMode: 'pvp-boss-quarter-level',
+        fightsCleared: 1,
-        lootSourceEncounterId: rewardEncounter?.sourceEncounterId,
+        experienceMode: isBossReward ? 'pvp-boss-quarter-level' : 'pvp-fight-twelfth-level',
-        roguelikeStage: stage,
+        lootSourceEncounterId: isBossReward ? rewardEncounter?.sourceEncounterId : undefined,
+        roguelikeStage: isBossReward ? stage : undefined,
       },
     )
       .then((result) => {
@@ -594,7 +612,7 @@ export function PvPRoguelikeScreen({
           const unlockedById = new Map(current.unlockedAbilities.map((ability) => [ability.id, ability]))
           result.unlockedAbilities.forEach((ability) => unlockedById.set(ability.id, ability))
           return {
-            bossesKilled: current.bossesKilled + 1,
+            bossesKilled: current.bossesKilled + (isBossReward ? 1 : 0),
             experienceGained: current.experienceGained + result.experienceGained,
             previousLevel: current.previousLevel ?? result.previousLevel,
             newLevel: result.newLevel,
@@ -605,6 +623,9 @@ export function PvPRoguelikeScreen({
           }
         })
         onProfileUpdated(result.profile)
+        if (!isBossReward && result.experienceGained > 0) {
+          addLog(`+${result.experienceGained} XP awarded.`, 'loot')
+        }
         if (result.bonusItem) {
           addLog(
             `${result.bonusItem.name} x${result.bonusItem.quantity} awarded.`,
@@ -626,13 +647,15 @@ export function PvPRoguelikeScreen({
 
   useEffect(() => {
     setPlayerBuffChoices((current) => current
-      .map((choice) => selfBuffChoicesCatalog.find((candidate) => candidate.id === choice.id))
+      .map((choice) => choice.id === REVIVE_PARTY_CHOICE.id
+        ? REVIVE_PARTY_CHOICE
+        : selfBuffChoicesCatalog.find((candidate) => candidate.id === choice.id))
       .filter((choice): choice is Choice<SelfBuffId> => Boolean(choice)))
     setPlayerDebuffChoices((current) => current
       .map((choice) => opponentDebuffChoicesCatalog.find((candidate) => candidate.id === choice.id))
       .filter((choice): choice is Choice<OpponentDebuffId> => Boolean(choice)))
     setSelectedBuff((current) => current
-      ? selfBuffChoicesCatalog.find((candidate) => candidate.id === current.id) ?? current
+      ? (current.id === REVIVE_PARTY_CHOICE.id ? REVIVE_PARTY_CHOICE : selfBuffChoicesCatalog.find((candidate) => candidate.id === current.id) ?? current)
       : null)
     setSelectedDebuff((current) => current
       ? opponentDebuffChoicesCatalog.find((candidate) => candidate.id === current.id) ?? current
@@ -679,7 +702,6 @@ export function PvPRoguelikeScreen({
     setStartStage(matchStartStage)
     setStage(matchStartStage)
     setElapsedTicks(0)
-    setStatus('playing')
     setPlayerSide(basePlayer)
     setCpuSide(baseOpponent)
     setSelectedTargetId(partyTemplate[0].id)
@@ -711,9 +733,11 @@ export function PvPRoguelikeScreen({
     const logText = message ?? `${opponent.characterName} found. Stage ${matchStartStage} begins.`
     setQueueMessage(logText)
     setLog([{ id: 1, text: logText, tone: 'system' }])
-  }, [contentType, cpuPartyTemplate, maxResource, partyTemplate, setSelectedTargetId])
+    beginRoundCountdown()
+  }, [beginRoundCountdown, contentType, cpuPartyTemplate, maxResource, partyTemplate, setSelectedTargetId])
 
   const startMatch = useCallback((nextStartStage?: number) => {
+    clearRoundCountdown()
     const matchStartStage = nextStartStage ?? loadPvpRoguelikeCheckpoint(profile.character.id, contentType)
     const firstSegment = buildEncounterSegment(encounterPoolRef.current, matchStartStage, contentType)
     const firstEncounter = firstSegment[0]
@@ -769,8 +793,7 @@ export function PvPRoguelikeScreen({
       setCpuDifficulty(randomCpu)
       setQueueMessage(message)
       setLog([{ id: 1, text: message, tone: 'system' }])
-      setStatus('playing')
+      beginRoundCountdown(`Stage ${matchStartStage} begins against CPU ${randomCpu}.`)
-      addLog(`Stage ${matchStartStage} begins against CPU ${randomCpu}.`, 'system')
     }
     if (gameMode === 'offline') {
       const randomCpu = randomCpuDifficulty()
@@ -839,7 +862,7 @@ export function PvPRoguelikeScreen({
       if (pollTimer) window.clearTimeout(pollTimer)
       if (ticketId && !liveMatchRef.current) cancelPvpQueue(ticketId).catch(() => undefined)
     }
-  }, [addLog, contentType, cpuPartyTemplate, gameMode, maxResource, partyTemplate, profile.character.id, setSelectedTargetId, startLiveMatch])
+  }, [beginRoundCountdown, clearRoundCountdown, contentType, cpuPartyTemplate, gameMode, maxResource, partyTemplate, profile.character.id, setSelectedTargetId, startLiveMatch])
 
   useEffect(() => startMatch(), [startMatch])
 
@@ -849,7 +872,7 @@ export function PvPRoguelikeScreen({
     const syncMatch = () => {
       publishPvpMatchState<SideState>(liveMatch.id, {
         state: playerRef.current,
-        status: status === 'upgrade-choice' ? 'upgrade-choice' : status,
+        status: status === 'upgrade-choice' ? 'upgrade-choice' : status === 'round-countdown' ? 'playing' : status,
         stage,
         encounterIndex,
         encountersCleared,
@@ -949,7 +972,7 @@ export function PvPRoguelikeScreen({
       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 groupPower = spell.power
         const nextHealth = healMember(member, groupPower, debuffs, healingMultiplier(member))
         addFloatingHeal(sideName, member.id, Math.max(0, nextHealth - member.health))
         const nextShield = hasSpellEffect('radiance_applies_shield')
@@ -966,7 +989,7 @@ export function PvPRoguelikeScreen({
       }
       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')))
+        const shieldPower = spell.power
         return {
           ...member,
           shield: Math.max(member.shield, shieldPower),
@@ -1000,16 +1023,6 @@ export function PvPRoguelikeScreen({
         hotTicks: hotTargets.has(member.id) ? 5 : member.hotTicks,
       }
     })
-    const freeCastStacks = buffStacks(buffs, 'fifth-cast-free')
-    const nextFreeCastReady = freeCastStacks > 0 && current.freeCastReady ? false : current.freeCastReady
-    const nextCastsTowardFree = freeCastStacks > 0
-      ? current.freeCastReady
-        ? 0
-        : current.castsTowardFree + 1 >= 5
-          ? 0
-          : current.castsTowardFree + 1
-      : current.castsTowardFree
-    const gainedFreeCast = freeCastStacks > 0 && !current.freeCastReady && current.castsTowardFree + 1 >= 5
     const nextCooldowns = {
       ...current.cooldowns,
     }
@@ -1022,8 +1035,8 @@ export function PvPRoguelikeScreen({
       party: nextParty,
       resource: current.resource - effectiveCost,
       cooldowns: nextCooldowns,
-      castsTowardFree: nextCastsTowardFree,
+      castsTowardFree: current.castsTowardFree,
-      freeCastReady: gainedFreeCast || nextFreeCastReady,
+      freeCastReady: false,
     }
     setCurrent(nextState)
     return true
@@ -1134,7 +1147,6 @@ export function PvPRoguelikeScreen({
     const appliesMaxHealthCut = encounterValue.isBoss && elapsedTicks > 0 && elapsedTicks % 13 === 0 && mechanics.includes('max-health-cut')
     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))
@@ -1150,7 +1162,6 @@ export function PvPRoguelikeScreen({
         ? Math.max(1, (member.poisonStacks ?? 0) + 1)
         : 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)
       }
@@ -1189,7 +1200,7 @@ export function PvPRoguelikeScreen({
       ...side,
       party: nextParty,
       resource: clamp(
-        side.resource + 2.4 * (0.75 ** buffStacks(side.debuffs, 'opp-resource-regen-down')),
+        side.resource + 2.4,
         0,
         maxResource,
       ),
@@ -1203,10 +1214,11 @@ export function PvPRoguelikeScreen({
   const beginUpgradePhase = useCallback(() => {
     upgradeChoiceEndsAtRef.current = Date.now() + UPGRADE_CHOICE_SECONDS * 1000
     autoSubmittedUpgradeRef.current = false
+    const playerNeedsRevive = hasDeadPartyMembers(playerRef.current)
     setUpgradeTimeLeft(UPGRADE_CHOICE_SECONDS)
-    setPlayerBuffChoices(chooseRandom(selfBuffChoicesCatalog, 3))
+    setPlayerBuffChoices(playerNeedsRevive ? [REVIVE_PARTY_CHOICE] : chooseRandom(selfBuffChoicesCatalog, 3))
     setPlayerDebuffChoices(chooseRandom(opponentDebuffChoicesCatalog, 3))
-    setSelectedBuff(null)
+    setSelectedBuff(playerNeedsRevive ? REVIVE_PARTY_CHOICE : null)
     setSelectedDebuff(null)
     setStatus('upgrade-choice')
   }, [opponentDebuffChoicesCatalog, selfBuffChoicesCatalog])
@@ -1221,8 +1233,8 @@ export function PvPRoguelikeScreen({
       if (nextPlayer.enemyHealth <= 0 && playerClearedEncounterRef.current !== encounterIndex) {
         playerClearedEncounterRef.current = encounterIndex
         setEncountersCleared((value) => value + 1)
+        awardEncounterReward(encounterIndex)
         if (encounter.isBoss) {
-          awardBossReward(encounterIndex)
           const nextCheckpoint = recordPvpRoguelikeCheckpoint(
             profile.character.id,
             contentType,
@@ -1266,7 +1278,7 @@ export function PvPRoguelikeScreen({
       }
     }, TICK_MS / speedMultiplier)
     return () => window.clearInterval(timer)
-  }, [addLog, advanceSide, awardBossReward, beginUpgradePhase, checkpointStage, contentType, cpuDifficulty, cpuTakeTurn, encounter, encounterIndex, encountersCleared, finishRoguelikeRun, liveMatch, paused, profile.character.id, speedMultiplier, stage, status])
+  }, [addLog, advanceSide, awardEncounterReward, beginUpgradePhase, checkpointStage, contentType, cpuDifficulty, cpuTakeTurn, encounter, encounterIndex, encountersCleared, finishRoguelikeRun, liveMatch, paused, profile.character.id, speedMultiplier, stage, status])
 
   useEffect(() => {
     if ((status !== 'won' && status !== 'lost') || recordedRunRef.current || !cpuDifficulty) return
@@ -1346,13 +1358,16 @@ export function PvPRoguelikeScreen({
       const applyLiveUpgrade = (opponentChoice: PvpUpgradeChoicePayload) => {
         let nextPlayer = {
           ...playerRef.current,
-          buffs: [...playerRef.current.buffs, submittedBuff.id],
+          buffs: submittedBuff.id === REVIVE_PARTY_CHOICE.id
+            ? playerRef.current.buffs
+            : [...playerRef.current.buffs, submittedBuff.id],
         }
-        if (opponentChoice.debuffId === 'opp-purge-random-buff') {
+        if (opponentDebuffChoicesCatalog.some((choice) => choice.id === opponentChoice.debuffId)) {
-          nextPlayer = removeRandomBuff(nextPlayer)
-        } else if (opponentDebuffChoicesCatalog.some((choice) => choice.id === opponentChoice.debuffId)) {
           nextPlayer = { ...nextPlayer, debuffs: [...nextPlayer.debuffs, opponentChoice.debuffId as OpponentDebuffId] }
         }
+        if (submittedBuff.id === REVIVE_PARTY_CHOICE.id) {
+          nextPlayer = { ...nextPlayer, debuffs: removeRandomDebuff(nextPlayer.debuffs) }
+        }
 
         const clearedBoss = encounter.isBoss
         if (clearedBoss && cpuDefeatedRef.current) {
@@ -1374,15 +1389,7 @@ export function PvPRoguelikeScreen({
         }
         nextPlayer = {
           ...nextPlayer,
-          party: nextPlayer.party.map((member) => ({
+          party: recoverPartyForNextEncounter(nextPlayer.party, submittedBuff.id === REVIVE_PARTY_CHOICE.id),
-            ...member,
-            health: member.health <= 0 ? 0 : clamp(member.health + Math.round(member.maxHealth * 0.3), 0, member.maxHealth),
-            debuff: undefined,
-            debuffTicks: undefined,
-            poisonStacks: undefined,
-            maxHealthPenaltyTicks: undefined,
-            healingReductionTicks: undefined,
-          })),
           resource: clamp(nextPlayer.resource + Math.round(maxResource * 0.25), 0, maxResource),
           cooldowns: {},
           enemyHealth: nextEncounter.maxHealth,
@@ -1397,7 +1404,7 @@ export function PvPRoguelikeScreen({
         setElapsedTicks(0)
         setLiveUpgradePending(false)
         pendingLiveUpgradeRef.current = null
-        setStatus('playing')
+        beginRoundCountdown()
         const opponentDebuff = opponentDebuffChoicesCatalog.find((choice) => choice.id === opponentChoice.debuffId)
         addLog(
           `You chose ${submittedBuff.name} and ${submittedDebuff.name}. ${liveMatch.opponentName} chose ${opponentDebuff?.name ?? 'an opponent debuff'}.`,
@@ -1443,30 +1450,34 @@ export function PvPRoguelikeScreen({
       return
     }
     if (!cpuDifficulty) return
-    const cpuBuffChoices = chooseRandom(selfBuffChoicesCatalog, 3)
+    const cpuBuffChoices = hasDeadPartyMembers(cpuRef.current)
+      ? [REVIVE_PARTY_CHOICE]
+      : chooseRandom(selfBuffChoicesCatalog, 3)
     const cpuDebuffChoices = chooseRandom(opponentDebuffChoicesCatalog, 3)
     const cpuBuff = selectCpuChoice(cpuBuffChoices, cpuDifficulty, (choice) => scoreSelfBuff(choice, starterSpells))
     const cpuDebuff = selectCpuChoice(cpuDebuffChoices, cpuDifficulty, (choice) => scoreDebuff(choice, playerRef.current.buffs.length))
 
     let nextPlayer = {
       ...playerRef.current,
-      buffs: [...playerRef.current.buffs, chosenBuff.id],
+      buffs: chosenBuff.id === REVIVE_PARTY_CHOICE.id
+        ? playerRef.current.buffs
+        : [...playerRef.current.buffs, chosenBuff.id],
     }
     let nextCpu = {
       ...cpuRef.current,
-      buffs: [...cpuRef.current.buffs, cpuBuff.id],
+      buffs: cpuBuff.id === REVIVE_PARTY_CHOICE.id
+        ? cpuRef.current.buffs
+        : [...cpuRef.current.buffs, cpuBuff.id],
     }
 
-    if (chosenDebuff.id === 'opp-purge-random-buff') {
-      nextCpu = removeRandomBuff(nextCpu)
-    } else {
     nextCpu = { ...nextCpu, debuffs: [...nextCpu.debuffs, chosenDebuff.id] }
-    }
 
-    if (cpuDebuff.id === 'opp-purge-random-buff') {
-      nextPlayer = removeRandomBuff(nextPlayer)
-    } else {
     nextPlayer = { ...nextPlayer, debuffs: [...nextPlayer.debuffs, cpuDebuff.id] }
+    if (chosenBuff.id === REVIVE_PARTY_CHOICE.id) {
+      nextPlayer = { ...nextPlayer, debuffs: removeRandomDebuff(nextPlayer.debuffs) }
+    }
+    if (cpuBuff.id === REVIVE_PARTY_CHOICE.id) {
+      nextCpu = { ...nextCpu, debuffs: removeRandomDebuff(nextCpu.debuffs) }
     }
 
     const clearedBoss = encounter.isBoss
@@ -1488,30 +1499,14 @@ export function PvPRoguelikeScreen({
 
     nextPlayer = {
       ...nextPlayer,
-      party: nextPlayer.party.map((member) => ({
+      party: recoverPartyForNextEncounter(nextPlayer.party, chosenBuff.id === REVIVE_PARTY_CHOICE.id),
-        ...member,
-        health: member.health <= 0 ? 0 : clamp(member.health + Math.round(member.maxHealth * 0.3), 0, member.maxHealth),
-        debuff: undefined,
-        debuffTicks: undefined,
-        poisonStacks: undefined,
-        maxHealthPenaltyTicks: undefined,
-        healingReductionTicks: undefined,
-      })),
       resource: clamp(nextPlayer.resource + Math.round(maxResource * 0.25), 0, maxResource),
       cooldowns: {},
       enemyHealth: nextEncounter.maxHealth,
     }
     nextCpu = {
       ...nextCpu,
-      party: nextCpu.party.map((member) => ({
+      party: recoverPartyForNextEncounter(nextCpu.party, cpuBuff.id === REVIVE_PARTY_CHOICE.id),
-        ...member,
-        health: member.health <= 0 ? 0 : clamp(member.health + Math.round(member.maxHealth * 0.3), 0, member.maxHealth),
-        debuff: undefined,
-        debuffTicks: undefined,
-        poisonStacks: undefined,
-        maxHealthPenaltyTicks: undefined,
-        healingReductionTicks: undefined,
-      })),
       resource: clamp(nextCpu.resource + Math.round(maxResource * 0.25), 0, maxResource),
       cooldowns: {},
       enemyHealth: nextEncounter.maxHealth,
@@ -1527,9 +1522,9 @@ export function PvPRoguelikeScreen({
     playerRef.current = nextPlayer
     cpuRef.current = nextCpu
     setElapsedTicks(0)
-    setStatus('playing')
+    beginRoundCountdown()
     addLog(`You chose ${chosenBuff.name} and ${chosenDebuff.name}. CPU ${cpuDifficulty} chose ${cpuBuff.name} and ${cpuDebuff.name}.`, 'system')
-  }, [addLog, contentType, cpuDifficulty, encounter, encounterIndex, encounterPool, encounters, finishRoguelikeRun, liveMatch, maxResource, opponentDebuffChoicesCatalog, selectedBuff, selectedDebuff, selfBuffChoicesCatalog, stage, starterSpells])
+  }, [addLog, beginRoundCountdown, contentType, cpuDifficulty, encounter, encounterIndex, encounterPool, encounters, finishRoguelikeRun, liveMatch, maxResource, opponentDebuffChoicesCatalog, selectedBuff, selectedDebuff, selfBuffChoicesCatalog, stage, starterSpells])
 
   useEffect(() => {
     if (status !== 'upgrade-choice' || liveUpgradePending) return
@@ -1633,7 +1628,7 @@ export function PvPRoguelikeScreen({
     partySize: playerSide.party.length,
     selectedId,
     log,
-    status: status === 'queueing' ? 'playing' : status,
+    status: status === 'queueing' || status === 'round-countdown' ? 'playing' : status,
     resource: playerSide.resource,
     maxResource,
     resourceName: gameClass.resourceName,
@@ -1861,6 +1856,15 @@ export function PvPRoguelikeScreen({
           </div>
         )}
 
+        {status === 'round-countdown' && (
+          <div className="pvp-round-countdown">
+            <div>
+              <p className="eyebrow">Round Starts</p>
+              <h2>{Math.max(1, Math.ceil(roundCountdown))}</h2>
+            </div>
+          </div>
+        )}
+
         {status === 'upgrade-choice' && (
           <div className="result-screen">
             <div className="pvp-upgrade-dialog">
@@ -1873,7 +1877,7 @@ export function PvPRoguelikeScreen({
               </div>
               <div className="pvp-choice-columns">
                 <div>
-                  <strong>Self Buff</strong>
+                  <strong>{playerBuffChoices.length === 1 && playerBuffChoices[0]?.id === REVIVE_PARTY_CHOICE.id ? 'Recovery' : 'Self Buff'}</strong>
                   <div className="upgrade-choice-grid">
                     {playerBuffChoices.map((choice) => (
                       <button

src/gameRepository.ts

@@ -37,7 +37,8 @@ export interface GameRepository {
     durationSeconds: number,
     options?: {
       bossesCleared?: number
-      experienceMode?: 'default' | 'pvp-boss-quarter-level'
+      experienceMode?: 'default' | 'pvp-boss-quarter-level' | 'pvp-fight-twelfth-level'
+      fightsCleared?: number
       lootSourceEncounterId?: number
       roguelikeStage?: number
     },
@@ -503,6 +504,31 @@ function scaledPvpBossExperience(
   return { experience, level }
 }
 
+function scaledPvpFightExperience(
+  startingExperience: number,
+  startingLevel: number,
+  fightsCleared: number,
+  maxLevel: number,
+  targetLevel = startingLevel,
+) {
+  let experience = startingExperience
+  let level = startingLevel
+  const maxExperience = experienceForLevel(maxLevel)
+  for (let fightIndex = 0; fightIndex < fightsCleared && experience < maxExperience; fightIndex += 1) {
+    const currentLevelFloor = experienceForLevel(level)
+    const nextLevelExperience = level >= maxLevel
+      ? maxExperience
+      : experienceForLevel(level + 1)
+    const levelBand = Math.max(1, nextLevelExperience - currentLevelFloor)
+    const rewardRate = targetLevel > level ? 1 / 6 : 1 / 12
+    experience = Math.min(maxExperience, experience + Math.round(levelBand * rewardRate))
+    while (level < maxLevel && experienceForLevel(level + 1) <= experience) {
+      level += 1
+    }
+  }
+  return { experience, level }
+}
+
 function talentEffectCapacity(level: number) {
   return Math.min(4, Math.max(0, Math.floor(level / 5)))
 }
@@ -1142,6 +1168,14 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     const bossesCleared = Math.max(0, Math.floor(options?.bossesCleared ?? encountersCleared / 3))
     const scaledReward = options?.experienceMode === 'pvp-boss-quarter-level'
       ? scaledPvpBossExperience(previousExperience, previousLevel, bossesCleared, profile.maxLevel, highestOtherClassLevel(save))
+      : options?.experienceMode === 'pvp-fight-twelfth-level'
+        ? scaledPvpFightExperience(
+          previousExperience,
+          previousLevel,
+          Math.max(0, Math.floor(options.fightsCleared ?? encountersCleared)),
+          profile.maxLevel,
+          highestOtherClassLevel(save),
+        )
         : null
     const baseRoguelikeReward = Math.round(dungeon.experienceReward * difficulty.experienceMultiplier * (encountersCleared / 3))
     const newExperience = scaledReward

src/profile.ts

@@ -349,7 +349,8 @@ export async function completeRoguelike(
   durationSeconds: number,
   options?: {
     bossesCleared?: number
-    experienceMode?: 'default' | 'pvp-boss-quarter-level'
+    experienceMode?: 'default' | 'pvp-boss-quarter-level' | 'pvp-fight-twelfth-level'
+    fightsCleared?: number
     lootSourceEncounterId?: number
     roguelikeStage?: number
   },