Android build v1.0.40

AGENTS.md

@@ -2,5 +2,8 @@
 
 - AYN Thor main display: 6-inch AMOLED, 1920 x 1080, 120Hz.
 - AYN Thor secondary display: 3.92-inch AMOLED, 1240 x 1080, 60Hz.
+- AYN Thor UI sizing must be designed against Android CSS/layout viewport, not physical framebuffer pixels.
+- Approximate Thor CSS viewports: main display 960 x 540, secondary display 620 x 540.
+- Test top-screen UI only against the main display viewport, and bottom-screen UI only against the secondary display viewport.
 - User rebuilds app; do not rebuild APK unless explicitly requested.
 - Apply game changes to both web version and mobile app version.

DEPLOYMENT.md

@@ -138,9 +138,12 @@ services:
 
 The app listens inside Docker on port `4173`. The database lives at
 `/mnt/usbssds/apps/iwanttoheal/data/game.db` because that host directory is
-mounted into the container as `/app/data`. The startup command installs
+mounted into the container as `/app/data`. This is persistent runtime data, not
-dependencies, applies schema migrations, builds the web app, and starts the
+code. Do not commit it and do not copy the Mac `data/game.db` over it during
-production server.
+deploys.
+
+The startup command installs dependencies, applies schema/static-content
+updates, builds the web app, and starts the production server.
 
 Test the local TrueNAS service:
 
@@ -220,11 +223,22 @@ cd /mnt/usbssds/apps/iwanttoheal/app
 git pull
 ```
 
+Before restarting, back up the persistent database:
+
+```sh
+cp /mnt/usbssds/apps/iwanttoheal/data/game.db \
+  "/mnt/usbssds/apps/iwanttoheal/data/game-before-update-$(date +%Y%m%d-%H%M%S).db"
+```
+
 Restart the `iwanttoheal` app in the TrueNAS Apps UI after pulling. The app
 command runs `npm ci`, `npm run db:init`, `npm run build`, and `npm start` on
 startup, so dependency, schema, and browser bundle changes are applied each time
 the container restarts.
 
+`npm run db:init` updates schema and seeded static game content. It should not
+erase accounts, characters, inventory, or save progress. Character resets are
+separate manual operations and should only be run intentionally.
+
 Normal update workflow:
 
 ```sh
@@ -236,10 +250,14 @@ git push origin main
 # TrueNAS shell
 cd /mnt/usbssds/apps/iwanttoheal/app
 git pull
+cp /mnt/usbssds/apps/iwanttoheal/data/game.db \
+  "/mnt/usbssds/apps/iwanttoheal/data/game-before-update-$(date +%Y%m%d-%H%M%S).db"
 ```
 
 Then restart the TrueNAS app.
 
+For the shorter checklist, see [docs/push-updates.md](docs/push-updates.md).
+
 ### Existing auth-only app
 
 If `iwanttoheal-auth` was already created during earlier testing, the simplest

README.md

@@ -57,13 +57,13 @@ For an online production build, see [DEPLOYMENT.md](DEPLOYMENT.md).
 - Dungeon XP rewards, level-up handling, talent-point awards, and ability unlocks
 - SQLite-backed class talent trees with ranks, tiers, prerequisites, refunds,
   and immediate persistence
-- Seven equipment slots, starter item-level 1 gear, inventory comparison, and
+- Nine equipment slots, empty starter inventory, craftable item-level 1 gear,
-  persistent equipping
+  inventory comparison, and persistent equipping
 - Aggregate item level, healing power, and resource bonuses that affect combat
-- Five SQLite-authored dungeon difficulty tiers with level gates, combat
+- Four playable SQLite-authored content tiers at item levels 1, 10, 20, and 25
-  scaling, XP multipliers, and item-level reward bands
+  with level gates, combat scaling, XP multipliers, and reward bands
-- Encounter-specific weighted loot tables for every difficulty, with authored
+- Gear progression through item levels 1, 5, 10, 15, 20, and 25 with
-  drop chances, slot pools, and item-level 5 through 25 reward variants
+  boss-coin crafting and upgrade steps
 - One live loot roll per defeated encounter, shown in the combat log and
   dungeon-complete summary
 - Atomic inventory awards with retry-safe roll records and stacked duplicate

android/app/build.gradle

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

android/app/src/main/java/com/warren/iwanttoheal/ControllerBridgeActivity.java

@@ -11,7 +11,7 @@ import java.io.File;
 public abstract class ControllerBridgeActivity extends BridgeActivity {
 
     public static final String EXTRA_INITIAL_URL = "com.warren.iwanttoheal.INITIAL_URL";
-    private static final long DPAD_THROTTLE_MS = 125;
+    private static final long DPAD_THROTTLE_MS = 220;
     private long lastDpadDispatchAt = 0;
 
     @Override

docs/gearing-system.md

@@ -1,172 +1,139 @@
 # Gearing System
 
-## Goal
+## Current Rule
 
-Gearing should move from boss-specific multi-item drop tables to one clear currency loop:
+The game uses fewer playable content tiers and more gear upgrade steps.
 
-1. Kill bosses.
+Content tiers:
-2. Earn boss coins.
-3. Craft gear with those coins.
-4. Upgrade that boss gear into the next item-level tier with higher-rarity coins.
 
-This keeps boss loot readable, removes low-percentage frustration, and makes every boss kill progress a targeted gear goal.
+| Content Tier | Unlock Level | Purpose |
+| --- | ---: | --- |
+| iLvl 1 | 1 | First real gear set |
+| iLvl 10 | 10 | Midgame jump |
+| iLvl 20 | 20 | Endgame jump |
+| iLvl 25 | 25 | Hard endgame |
+
+Gear tiers:
+
+| Gear Tier | How It Is Used |
+| ---: | --- |
+| 1 | Crafted from iLvl 1 content |
+| 5 | Upgrade tier from iLvl 1 content coins |
+| 10 | Crafted/upgraded from iLvl 10 content coins |
+| 15 | Gear-only upgrade tier from iLvl 10 content coins |
+| 20 | Crafted/upgraded from iLvl 20 content coins |
+| 25 | Crafted/upgraded from iLvl 25 content coins |
+
+This keeps the dungeon/raid picker simple while still giving players steady gear goals.
+
+## New Characters
+
+New characters start with no gear equipped.
+
+The first goal is to clear iLvl 1 content, earn raw boss coins, and craft the first iLvl 1 set. Starter gear exists as craftable gear, not automatic inventory.
 
 ## Coin Tiers
 
-Coins are component items. Each coin is tied to a boss source and an item-level tier.
+Coins are component items. Each coin is tied to a boss and a content tier.
 
-| Item Level | Display Color | Rarity Key | Example |
+| Content Tier | Coin Prefix | Rarity Key | Example |
-| --- | --- | --- | --- |
+| ---: | --- | --- | --- |
-| 5 | White | common | Bulldrome Coin |
+| 1 | Raw | common | Raw Bulldrome Coin |
 | 10 | Green | uncommon | Green Bulldrome Coin |
-| 15 | Blue | rare | Blue Bulldrome Coin |
 | 20 | Purple | epic | Purple Bulldrome Coin |
 | 25 | Orange | legendary | Orange Bulldrome Coin |
 
-Implementation note: the current TypeScript rarity union supports `common`, `uncommon`, `rare`, and `epic`. Orange needs a new rarity key, recommended as `legendary`, plus UI color styling.
+iLvl 5 and iLvl 15 gear do not have their own playable content tier. They use coins from the previous playable tier:
+
+| Gear Tier | Coin Tier Used |
+| ---: | ---: |
+| 1 | 1 |
+| 5 | 1 |
+| 10 | 10 |
+| 15 | 10 |
+| 20 | 20 |
+| 25 | 25 |
 
 ## Boss Loot
 
-Each boss has one loot roll.
+Each boss drops one boss coin for the selected content tier.
-
-For now, each successful boss loot roll awards 1 to 3 coins:
-
-| Roll Result | Coins Awarded |
-| --- | --- |
-| Low roll | 1 coin |
-| Normal roll | 2 coins |
-| High roll | 3 coins |
-
-Recommended weighting:
-
-| Coins | Chance |
-| --- | --- |
-| 1 | 50% |
-| 2 | 35% |
-| 3 | 15% |
-
-The coin source comes from the defeated boss. Bulldrome drops Bulldrome coins, Rathian drops Rathian coins, and so on.
-
-The coin tier comes from content difficulty or roguelike depth:
-
-| Source | Coin Tier |
-| --- | --- |
-| Item level 5 content | White level 5 coins |
-| Item level 10 content | Green level 10 coins |
-| Item level 15 content | Blue level 15 coins |
-| Item level 20 content | Purple level 20 coins |
-| Item level 25 content | Orange level 25 coins |
-
-## Crafting Costs
-
-Gear is crafted with boss coins from the same boss and item-level tier.
-
-| Gear Item Level | Cost |
-| --- | --- |
-| 5 | 5 white boss coins |
-| 10 | 10 green boss coins |
-| 15 | 15 blue boss coins |
-| 20 | 20 purple boss coins |
-| 25 | 25 orange boss coins |
-
-Example:
-
-- Bulldrome item-level 5 helmet costs 5 white Bulldrome coins.
-- Bulldrome item-level 10 helmet costs 10 green Bulldrome coins.
-- Rathian item-level 20 gloves cost 20 purple Rathian coins.
-
-## Gear Upgrades
-
-Crafting can create gear directly, but upgrades should become the preferred long-term path.
-
-Upgrade rule:
-
-- Existing boss gear upgrades into the next item-level version of the same boss gear.
-- Upgrade cost uses coins from the next tier.
-- Required coin quantity equals the target item level.
 
 Examples:
 
-| Upgrade | Cost |
+- Bulldrome at iLvl 1 drops Raw Bulldrome Coins.
-| --- | --- |
+- Tigrex at iLvl 10 drops Green Tigrex Coins.
-| Bulldrome item level 5 gear -> Bulldrome item level 10 gear | 10 green Bulldrome coins |
+- Barroth at iLvl 20 drops Purple Barroth Coins.
-| Bulldrome item level 10 gear -> Bulldrome item level 15 gear | 15 blue Bulldrome coins |
+- Anjanath at iLvl 25 drops Orange Anjanath Coins.
-| Bulldrome item level 15 gear -> Bulldrome item level 20 gear | 20 purple Bulldrome coins |
-| Bulldrome item level 20 gear -> Bulldrome item level 25 gear | 25 orange Bulldrome coins |
 
-Upgrade should consume the old item and award the upgraded item. This avoids duplicate clutter and keeps equipment identity clear.
+## Crafting And Upgrades
+
+The first gear item in a boss/item line can be crafted directly. Higher versions should be reached through Upgrade.
+
+Current rule:
+
+- Craft iLvl 1 boss gear directly.
+- Upgrade iLvl 1 -> 5 with iLvl 1 coins.
+- Craft or upgrade iLvl 10 gear from iLvl 10 content.
+- Upgrade iLvl 10 -> 15 with iLvl 10 coins.
+- Craft or upgrade iLvl 20 gear from iLvl 20 content.
+- Craft or upgrade iLvl 25 gear from iLvl 25 content.
+
+Upgrade consumes the old item and awards the upgraded item. This avoids duplicate clutter and keeps item identity clear.
+
+Examples:
+
+| Upgrade | Cost Source |
+| --- | --- |
+| Raw Bulldrome Helmet iLvl 1 -> Honed Bulldrome Helmet iLvl 5 | Raw Bulldrome Coins |
+| Green Tigrex Helmet iLvl 10 -> Blue Tigrex Helmet iLvl 15 | Green Tigrex Coins |
+| Purple Bulldrome Helmet iLvl 20 -> Orange Bulldrome Helmet iLvl 25 | Orange Bulldrome Coins |
+
+## UI Behavior
+
+The dungeon and raid picker only shows playable content tiers:
+
+```text
+iLvl 1 -> iLvl 10 -> iLvl 20 -> iLvl 25
+```
+
+The equipment screen still shows gear recipes for:
+
+```text
+iLvl 1 -> iLvl 5 -> iLvl 10 -> iLvl 15 -> iLvl 20 -> iLvl 25
+```
+
+Direct crafting is blocked for recipes that have a lower item-level version in the same boss/item line. Use the selected item's Upgrade button for those.
 
 ## Roguelike Loot
 
-Roguelike bosses should award coins when defeated, using the same 1 to 3 coin roll.
+Roguelike gear should follow the same tier brackets.
 
-Roguelike coin tier should scale by wave band:
+Recommended mapping:
 
-| Waves | Coin Tier |
+| Stage Band | Coin Tier |
-| --- | --- |
+| --- | ---: |
-| 1-4 | Level 5 white coins |
+| 1-4 | 1 |
-| 5-9 | Level 10 green coins |
+| 5-9 | 10 |
-| 10-14 | Level 15 blue coins |
-| 15-19 | Level 20 purple coins |
-| 20+ | Level 25 orange coins |
-
-Boss identity can be handled two ways:
-
-1. Boss-based coins: use the actual boss template selected for that roguelike boss.
-2. Roguelike coins: use a generic roguelike coin per tier.
-
-Recommended first pass: boss-based coins. It reuses the same crafting economy as dungeons and makes roguelike runs feel connected to the main gear chase.
-
-## Roguelike Checkpoints
-
-Checkpoints should unlock every 5 waves.
-
-| Highest Cleared Wave | Future Start Wave |
-| --- | --- |
-| 0-4 | 1 |
-| 5-9 | 5 |
 | 10-14 | 10 |
-| 15-19 | 15 |
+| 15-19 | 20 |
-| 20+ | Highest unlocked 5-wave checkpoint |
+| 20+ | 25 |
 
-Checkpoint rule:
+Boss-based coins are still preferred. A roguelike boss should award coins for its actual boss template when possible.
 
-- Unlock a checkpoint after clearing its boss band.
+## Data Notes
-- Starting from a checkpoint begins at that wave band with matching coin tier.
-- Runs should still record leaderboard progress from the selected start wave so full runs and checkpoint runs can be ranked separately later.
 
-Current implementation note: the roguelike screen always starts at stage 1 and only awards XP per boss. Checkpoints need saved character progress and a start-wave selector.
+Authoritative gearing data lives in SQLite seed data:
 
-## Current Code Fit
+- `db/seed.sql`
+- `src/offline-starter-profile.json`
 
-The existing system already has most of the required foundation:
+Run this after changing seed data:
 
-- `items.slot = 'component'` can represent coins.
+```sh
-- `character_inventory.quantity` already stacks components.
+npm run db:init
-- `crafting_recipes` and `crafting_recipe_components` already support coin costs.
+npm run offline:export
-- `encounter_loot_rolls` and `encounter_loot_roll_items` already persist retry-safe loot awards.
+```
-- `completeRoguelike` is already called after each roguelike boss kill for XP, so coin awards can attach to that same flow.
 
-Needed changes:
+`npm run build` already runs `offline:export`, so a production build also refreshes the offline starter profile.
 
-- Replace current 4-component boss drop tables with one boss coin per boss per tier.
+TrueNAS keeps its own persistent `data/game.db`. Pushing code does not merge or replace that database. The TrueNAS app applies seed/schema changes when the container starts and runs `npm run db:init`.
-- Change boss loot roll count from multiple chance slots to one 1-3 coin roll.
-- Add orange/legendary rarity support.
-- Add upgrade recipes or a dedicated upgrade endpoint.
-- Add roguelike boss coin awards.
-- Add roguelike checkpoint persistence and start-wave selection.
-- Export updated offline starter data after seed changes.
-
-## Suggestions
-
-Use guaranteed coin drops for now. One to three coins per boss gives steady progress and makes craft timing easy to understand.
-
-Keep coins boss-specific, not slot-specific. Slot-specific components add complexity without much decision value.
-
-Use upgrade-first UI. Show the next upgrade for equipped gear before showing the full crafting catalog.
-
-Keep direct crafting and upgrading at the same coin cost for the target tier. Direct crafting helps new slots catch up; upgrading preserves boss gear identity.
-
-Add a pity floor only if needed later. If boss kills always award coins, the system already has deterministic progress.
-
-Use one orange rarity key: `legendary`. Avoid storing display color names as rarity values; colors can change without data migration.

docs/push-updates.md

@@ -0,0 +1,164 @@
+# Push Updates
+
+Use this when pushing code from the Mac to `git.whoagland.com`, then updating the TrueNAS-hosted server.
+
+## Rules
+
+- Git deploys code only.
+- TrueNAS save data lives in `/mnt/usbssds/apps/iwanttoheal/data/game.db`.
+- Do not commit, copy, or replace `data/game.db`.
+- Do not run character reset commands unless you intentionally want a wipe.
+- Restarting the TrueNAS app runs `npm ci`, `npm run db:init`, `npm run build`, and `npm start`.
+
+## Step 1: Build Web Locally
+
+```sh
+cd /Users/warren/Documents/testgame/testgame
+npm run build
+```
+
+This validates TypeScript, builds the browser app, and refreshes `src/offline-starter-profile.json`.
+
+## Step 2: Optional Android APK
+
+Only run this when building a new APK.
+
+```sh
+set -e
+
+cd /Users/warren/Documents/testgame/testgame
+
+export JAVA_HOME="/Applications/Android Studio.app/Contents/jbr/Contents/Home"
+export PATH="$JAVA_HOME/bin:$PATH"
+
+VERSION="1.0.27"
+
+CURRENT_CODE=$(grep -E 'versionCode [0-9]+' android/app/build.gradle | awk '{print $2}')
+NEXT_CODE=$((CURRENT_CODE + 1))
+
+perl -0pi -e "s/versionCode\s+\d+/versionCode $NEXT_CODE/" android/app/build.gradle
+perl -0pi -e "s/versionName\s+\"[^\"]+\"/versionName \"$VERSION\"/" android/app/build.gradle
+
+VITE_API_BASE_URL="https://iwanttoheal.phenomrom.com" npm run android:sync
+
+cd android
+./gradlew clean assembleDebug
+cd ..
+
+cp android/app/build/outputs/apk/debug/app-debug.apk "IWantToHeal-Thor-v$VERSION.apk"
+ls -lh "IWantToHeal-Thor-v$VERSION.apk"
+```
+
+## Step 3: Commit And Push Code
+
+```sh
+cd /Users/warren/Documents/testgame/testgame
+
+git add .
+git commit -m "Update game 1.0.27"
+git push origin main
+```
+
+Check before committing:
+
+```sh
+git status --short
+```
+
+Expected: source/doc/build-output changes only. Do not stage `data/game.db`.
+
+## Step 4: Optional Gitea Release For APK
+
+Only run this when Step 2 created a new APK.
+
+```sh
+set -e
+
+cd /Users/warren/Documents/testgame/testgame
+
+export GITEA_URL="https://git.whoagland.com"
+export GITEA_OWNER="phenom"
+export GITEA_REPO="i-want-to-heal"
+export GITEA_TOKEN="ed2db3fd54546e9658377d0551b3fc3961583f1d"
+
+VERSION="1.0.27"
+APK="IWantToHeal-Thor-v$VERSION.apk"
+
+RELEASE_JSON=$(curl -sS -X POST "$GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/releases" \
+  -H "Authorization: token $GITEA_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d "{\"tag_name\":\"v$VERSION\",\"target_commitish\":\"main\",\"name\":\"v$VERSION\",\"body\":\"I Want to Heal Android build v$VERSION\",\"draft\":false,\"prerelease\":false}")
+
+RELEASE_ID=$(python3 -c 'import sys,json; data=json.load(sys.stdin); print(data.get("id") or data)' <<< "$RELEASE_JSON")
+
+curl -sS -X POST "$GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/releases/$RELEASE_ID/assets?name=$APK" \
+  -H "Authorization: token $GITEA_TOKEN" \
+  -F "attachment=@$APK"
+```
+
+## Step 5: Update TrueNAS
+
+```sh
+cd /mnt/usbssds/apps/iwanttoheal/app
+git pull
+```
+
+Before restarting, make a DB backup:
+
+```sh
+cp /mnt/usbssds/apps/iwanttoheal/data/game.db \
+  "/mnt/usbssds/apps/iwanttoheal/data/game-before-update-$(date +%Y%m%d-%H%M%S).db"
+```
+
+Then restart the `iwanttoheal` app in the TrueNAS Apps UI.
+
+## What Happens On Restart
+
+The app command runs:
+
+```sh
+npm ci && npm run db:init && npm run build && npm start
+```
+
+That means:
+
+- dependency changes apply
+- schema changes apply
+- seed/static-content updates apply
+- browser files rebuild
+- existing accounts and characters stay in `data/game.db`
+
+`npm run db:init` should not wipe saves. Character wipes are separate manual reset operations.
+
+## Resetting TrueNAS Characters
+
+Only run a reset when intentionally starting everyone over.
+
+Resetting the Mac database does not reset TrueNAS. TrueNAS has its own persistent DB at:
+
+```text
+/mnt/usbssds/apps/iwanttoheal/data/game.db
+```
+
+Back it up first, then run the reset command or reset SQL on TrueNAS.
+
+## If Something Looks Wrong
+
+Check the mounted DB path:
+
+```sh
+ls -lh /mnt/usbssds/apps/iwanttoheal/data/game.db
+```
+
+Check the latest code:
+
+```sh
+cd /mnt/usbssds/apps/iwanttoheal/app
+git log --oneline -5
+```
+
+Check the app API:
+
+```sh
+curl http://127.0.0.1:4173/api/auth/session
+```

docs/ui-mockups/dungeon-option-a.svg

@@ -0,0 +1,60 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1280" height="720" viewBox="0 0 1280 720">
+  <rect width="1280" height="720" fill="#111218"/>
+  <rect x="48" y="36" width="1184" height="648" fill="#1b1c24" stroke="#090a0d" stroke-width="4"/>
+  <text x="78" y="78" fill="#8f90a0" font-family="monospace" font-size="18">ADVENTURE</text>
+  <text x="78" y="114" fill="#f2f0dc" font-family="monospace" font-size="34" font-weight="700">Dungeons</text>
+  <text x="1075" y="88" fill="#e5b95f" font-family="monospace" font-size="18">B Back</text>
+
+  <text x="78" y="158" fill="#e5b95f" font-family="monospace" font-size="18">Pick Dungeon</text>
+  <g>
+    <rect x="78" y="178" width="335" height="128" fill="#24262f" stroke="#e5b95f" stroke-width="5"/>
+    <rect x="94" y="194" width="72" height="72" fill="#481e29" stroke="#090a0d" stroke-width="3"/>
+    <text x="116" y="241" fill="#ef6574" font-family="monospace" font-size="28" font-weight="700">AH</text>
+    <text x="184" y="216" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Ashen Halls</text>
+    <text x="184" y="246" fill="#aaa9b7" font-family="monospace" font-size="16">Level 1 • 6 Players</text>
+    <text x="184" y="276" fill="#e5b95f" font-family="monospace" font-size="16">Selected</text>
+  </g>
+  <g>
+    <rect x="436" y="178" width="335" height="128" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <rect x="452" y="194" width="72" height="72" fill="#2a263f" stroke="#090a0d" stroke-width="3"/>
+    <text x="474" y="241" fill="#8ca9ff" font-family="monospace" font-size="28" font-weight="700">SC</text>
+    <text x="542" y="216" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Sunken Crypt</text>
+    <text x="542" y="246" fill="#aaa9b7" font-family="monospace" font-size="16">Level 5 • 6 Players</text>
+  </g>
+  <g opacity="0.65">
+    <rect x="794" y="178" width="335" height="128" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <rect x="810" y="194" width="72" height="72" fill="#223226" stroke="#090a0d" stroke-width="3"/>
+    <text x="832" y="241" fill="#70d990" font-family="monospace" font-size="28" font-weight="700">GM</text>
+    <text x="900" y="216" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Grove Maw</text>
+    <text x="900" y="246" fill="#aaa9b7" font-family="monospace" font-size="16">Level 10 • 6 Players</text>
+  </g>
+
+  <text x="78" y="356" fill="#e5b95f" font-family="monospace" font-size="18">Pick Part</text>
+  <g>
+    <rect x="78" y="376" width="282" height="82" fill="#29291f" stroke="#e5b95f" stroke-width="5"/>
+    <text x="112" y="426" fill="#f2f0dc" font-family="monospace" font-size="24" font-weight="700">Part 1</text>
+    <text x="250" y="426" fill="#8f90a0" font-family="monospace" font-size="16">3 fights</text>
+  </g>
+  <g>
+    <rect x="382" y="376" width="282" height="82" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="416" y="426" fill="#f2f0dc" font-family="monospace" font-size="24" font-weight="700">Part 2</text>
+    <text x="554" y="426" fill="#8f90a0" font-family="monospace" font-size="16">Locked</text>
+  </g>
+  <g>
+    <rect x="686" y="376" width="282" height="82" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="720" y="426" fill="#f2f0dc" font-family="monospace" font-size="24" font-weight="700">Part 3</text>
+    <text x="858" y="426" fill="#8f90a0" font-family="monospace" font-size="16">Locked</text>
+  </g>
+
+  <text x="78" y="508" fill="#e5b95f" font-family="monospace" font-size="18">Pick Difficulty</text>
+  <rect x="78" y="528" width="240" height="64" fill="#29291f" stroke="#e5b95f" stroke-width="5"/>
+  <text x="116" y="568" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Normal</text>
+  <rect x="342" y="528" width="240" height="64" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <text x="380" y="568" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Heroic</text>
+  <rect x="606" y="528" width="240" height="64" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <text x="644" y="568" fill="#777988" font-family="monospace" font-size="20" font-weight="700">Mythic L10</text>
+
+  <rect x="914" y="508" width="238" height="86" fill="#3a2618" stroke="#e5b95f" stroke-width="5"/>
+  <text x="982" y="559" fill="#f2f0dc" font-family="monospace" font-size="24" font-weight="700">Start</text>
+  <text x="78" y="638" fill="#aaa9b7" font-family="monospace" font-size="17">Idea A: All choices are button grids. D-pad works everywhere. No native dropdown.</text>
+</svg>

docs/ui-mockups/dungeon-option-b.svg

@@ -0,0 +1,44 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1280" height="720" viewBox="0 0 1280 720">
+  <rect width="1280" height="720" fill="#111218"/>
+  <rect x="48" y="36" width="1184" height="648" fill="#1b1c24" stroke="#090a0d" stroke-width="4"/>
+  <text x="78" y="78" fill="#8f90a0" font-family="monospace" font-size="18">ADVENTURE</text>
+  <text x="78" y="114" fill="#f2f0dc" font-family="monospace" font-size="34" font-weight="700">Dungeons</text>
+  <text x="1014" y="88" fill="#e5b95f" font-family="monospace" font-size="18">LB/RB Change</text>
+
+  <rect x="78" y="150" width="760" height="398" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <rect x="112" y="184" width="164" height="164" fill="#481e29" stroke="#090a0d" stroke-width="4"/>
+  <text x="151" y="280" fill="#ef6574" font-family="monospace" font-size="48" font-weight="700">AH</text>
+  <text x="306" y="202" fill="#8f90a0" font-family="monospace" font-size="18">CURRENT DUNGEON</text>
+  <text x="306" y="248" fill="#f2f0dc" font-family="monospace" font-size="34" font-weight="700">Ashen Halls</text>
+  <text x="306" y="286" fill="#aaa9b7" font-family="monospace" font-size="18">Guide a six-player party through burning halls.</text>
+  <text x="306" y="324" fill="#e5b95f" font-family="monospace" font-size="18">Level 1 • 6 Players • 100 XP</text>
+  <rect x="112" y="384" width="690" height="104" fill="#15161c" stroke="#33343d" stroke-width="3"/>
+  <text x="138" y="425" fill="#f2f0dc" font-family="monospace" font-size="19">Ashen Halls</text>
+  <text x="356" y="425" fill="#8f90a0" font-family="monospace" font-size="19">Sunken Crypt</text>
+  <text x="608" y="425" fill="#8f90a0" font-family="monospace" font-size="19">Grove Maw</text>
+  <rect x="128" y="448" width="146" height="8" fill="#e5b95f"/>
+
+  <rect x="874" y="150" width="278" height="398" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <text x="906" y="194" fill="#e5b95f" font-family="monospace" font-size="18">Setup</text>
+  <text x="906" y="232" fill="#f2f0dc" font-family="monospace" font-size="22" font-weight="700">Part</text>
+  <rect x="906" y="252" width="68" height="54" fill="#29291f" stroke="#e5b95f" stroke-width="4"/>
+  <text x="932" y="286" fill="#f2f0dc" font-family="monospace" font-size="20">1</text>
+  <rect x="990" y="252" width="68" height="54" fill="#20222a" stroke="#41404a" stroke-width="3"/>
+  <text x="1016" y="286" fill="#8f90a0" font-family="monospace" font-size="20">2</text>
+  <rect x="1074" y="252" width="68" height="54" fill="#20222a" stroke="#41404a" stroke-width="3"/>
+  <text x="1100" y="286" fill="#8f90a0" font-family="monospace" font-size="20">3</text>
+
+  <text x="906" y="350" fill="#f2f0dc" font-family="monospace" font-size="22" font-weight="700">Difficulty</text>
+  <rect x="906" y="372" width="236" height="52" fill="#29291f" stroke="#e5b95f" stroke-width="4"/>
+  <text x="938" y="405" fill="#f2f0dc" font-family="monospace" font-size="18">Normal</text>
+  <rect x="906" y="436" width="236" height="52" fill="#20222a" stroke="#41404a" stroke-width="3"/>
+  <text x="938" y="469" fill="#aaa9b7" font-family="monospace" font-size="18">Heroic</text>
+
+  <rect x="78" y="580" width="238" height="70" fill="#15161c" stroke="#41404a" stroke-width="4"/>
+  <text x="120" y="624" fill="#e5b95f" font-family="monospace" font-size="22">Prev</text>
+  <rect x="342" y="580" width="238" height="70" fill="#15161c" stroke="#41404a" stroke-width="4"/>
+  <text x="392" y="624" fill="#e5b95f" font-family="monospace" font-size="22">Next</text>
+  <rect x="874" y="580" width="278" height="70" fill="#3a2618" stroke="#e5b95f" stroke-width="5"/>
+  <text x="963" y="624" fill="#f2f0dc" font-family="monospace" font-size="24" font-weight="700">Start</text>
+  <text x="78" y="684" fill="#aaa9b7" font-family="monospace" font-size="17">Idea B: One big focused dungeon. Shoulder buttons or side buttons cycle dungeon.</text>
+</svg>

docs/ui-mockups/dungeon-option-c.svg

@@ -0,0 +1,48 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1280" height="720" viewBox="0 0 1280 720">
+  <rect width="1280" height="720" fill="#111218"/>
+  <rect x="48" y="36" width="1184" height="648" fill="#1b1c24" stroke="#090a0d" stroke-width="4"/>
+  <text x="78" y="78" fill="#8f90a0" font-family="monospace" font-size="18">ADVENTURE</text>
+  <text x="78" y="114" fill="#f2f0dc" font-family="monospace" font-size="34" font-weight="700">Mission Board</text>
+  <text x="1046" y="88" fill="#e5b95f" font-family="monospace" font-size="18">A Start</text>
+
+  <rect x="78" y="150" width="500" height="474" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <text x="112" y="194" fill="#e5b95f" font-family="monospace" font-size="18">Available Runs</text>
+  <g>
+    <rect x="112" y="222" width="432" height="82" fill="#29291f" stroke="#e5b95f" stroke-width="5"/>
+    <text x="136" y="255" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Ashen Halls • Part 1</text>
+    <text x="136" y="283" fill="#aaa9b7" font-family="monospace" font-size="16">Normal • iLvl 1 • 100 XP</text>
+  </g>
+  <g>
+    <rect x="112" y="318" width="432" height="82" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="136" y="351" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Ashen Halls • Part 1</text>
+    <text x="136" y="379" fill="#aaa9b7" font-family="monospace" font-size="16">Heroic • iLvl 5 • 140 XP</text>
+  </g>
+  <g opacity="0.65">
+    <rect x="112" y="414" width="432" height="82" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="136" y="447" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Sunken Crypt • Part 1</text>
+    <text x="136" y="475" fill="#aaa9b7" font-family="monospace" font-size="16">Normal • Locked Level 5</text>
+  </g>
+  <g opacity="0.65">
+    <rect x="112" y="510" width="432" height="82" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="136" y="543" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Ashen Halls • Part 2</text>
+    <text x="136" y="571" fill="#aaa9b7" font-family="monospace" font-size="16">Normal • Locked until Part 1 clear</text>
+  </g>
+
+  <rect x="616" y="150" width="536" height="474" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <rect x="650" y="184" width="130" height="130" fill="#481e29" stroke="#090a0d" stroke-width="4"/>
+  <text x="684" y="262" fill="#ef6574" font-family="monospace" font-size="42" font-weight="700">AH</text>
+  <text x="812" y="194" fill="#8f90a0" font-family="monospace" font-size="18">SELECTED RUN</text>
+  <text x="812" y="238" fill="#f2f0dc" font-family="monospace" font-size="30" font-weight="700">Ashen Halls</text>
+  <text x="812" y="278" fill="#e5b95f" font-family="monospace" font-size="20">Part 1 • Normal</text>
+  <text x="650" y="358" fill="#aaa9b7" font-family="monospace" font-size="17">Fastest path for controller play. One list item is the exact run.</text>
+  <text x="650" y="394" fill="#aaa9b7" font-family="monospace" font-size="17">No separate dungeon, phase, or difficulty controls.</text>
+
+  <rect x="650" y="440" width="470" height="64" fill="#15161c" stroke="#33343d" stroke-width="3"/>
+  <text x="680" y="480" fill="#f2f0dc" font-family="monospace" font-size="18">Health 1.00x  Damage 1.00x  XP 1.0x</text>
+  <rect x="650" y="532" width="220" height="62" fill="#3a2618" stroke="#e5b95f" stroke-width="5"/>
+  <text x="716" y="570" fill="#f2f0dc" font-family="monospace" font-size="22" font-weight="700">Start</text>
+  <rect x="900" y="532" width="220" height="62" fill="#15161c" stroke="#41404a" stroke-width="4"/>
+  <text x="955" y="570" fill="#e5b95f" font-family="monospace" font-size="22">Loot</text>
+
+  <text x="78" y="684" fill="#aaa9b7" font-family="monospace" font-size="17">Idea C: Flat mission list. Most controller-friendly, least setup flexibility on one screen.</text>
+</svg>

docs/ui-mockups/dungeon-option-d.svg

@@ -0,0 +1,72 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1280" height="720" viewBox="0 0 1280 720">
+  <rect width="1280" height="720" fill="#111218"/>
+  <rect x="48" y="36" width="1184" height="648" fill="#1b1c24" stroke="#090a0d" stroke-width="4"/>
+  <text x="78" y="78" fill="#8f90a0" font-family="monospace" font-size="18">ADVENTURE</text>
+  <text x="78" y="114" fill="#f2f0dc" font-family="monospace" font-size="34" font-weight="700">Dungeons</text>
+  <text x="958" y="88" fill="#e5b95f" font-family="monospace" font-size="18">B Back  •  A Select</text>
+
+  <text x="78" y="158" fill="#e5b95f" font-family="monospace" font-size="18">1. Pick Item Level</text>
+  <g>
+    <rect x="78" y="178" width="170" height="72" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="125" y="222" fill="#f2f0dc" font-family="monospace" font-size="22">5</text>
+    <text x="108" y="240" fill="#8f90a0" font-family="monospace" font-size="12">Initiate</text>
+  </g>
+  <g>
+    <rect x="268" y="178" width="170" height="72" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="310" y="222" fill="#f2f0dc" font-family="monospace" font-size="22">10</text>
+    <text x="300" y="240" fill="#8f90a0" font-family="monospace" font-size="12">Veteran</text>
+  </g>
+  <g>
+    <rect x="458" y="178" width="170" height="72" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="500" y="222" fill="#f2f0dc" font-family="monospace" font-size="22">15</text>
+    <text x="488" y="240" fill="#8f90a0" font-family="monospace" font-size="12">Champion</text>
+  </g>
+  <g>
+    <rect x="648" y="178" width="170" height="72" fill="#29291f" stroke="#e5b95f" stroke-width="5"/>
+    <text x="690" y="222" fill="#f2f0dc" font-family="monospace" font-size="22" font-weight="700">20</text>
+    <text x="690" y="240" fill="#e5b95f" font-family="monospace" font-size="12">Mythic</text>
+  </g>
+  <g opacity="0.65">
+    <rect x="838" y="178" width="170" height="72" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <text x="880" y="222" fill="#777988" font-family="monospace" font-size="22">25</text>
+    <text x="864" y="240" fill="#777988" font-family="monospace" font-size="12">Level 20</text>
+  </g>
+
+  <text x="78" y="304" fill="#e5b95f" font-family="monospace" font-size="18">2. Pick Run</text>
+  <g>
+    <rect x="78" y="324" width="335" height="154" fill="#29291f" stroke="#e5b95f" stroke-width="5"/>
+    <rect x="96" y="346" width="64" height="64" fill="#481e29" stroke="#090a0d" stroke-width="3"/>
+    <text x="114" y="387" fill="#ef6574" font-family="monospace" font-size="24" font-weight="700">AH</text>
+    <text x="178" y="360" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Ashen Halls</text>
+    <text x="178" y="389" fill="#aaa9b7" font-family="monospace" font-size="15">Mythic • iLvl 20</text>
+    <text x="96" y="446" fill="#e5b95f" font-family="monospace" font-size="16">Part 1 unlocked</text>
+  </g>
+  <g>
+    <rect x="436" y="324" width="335" height="154" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <rect x="454" y="346" width="64" height="64" fill="#2a263f" stroke="#090a0d" stroke-width="3"/>
+    <text x="472" y="387" fill="#8ca9ff" font-family="monospace" font-size="24" font-weight="700">SC</text>
+    <text x="536" y="360" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Sunken Crypt</text>
+    <text x="536" y="389" fill="#aaa9b7" font-family="monospace" font-size="15">Mythic • iLvl 20</text>
+    <text x="454" y="446" fill="#aaa9b7" font-family="monospace" font-size="16">Part 1 unlocked</text>
+  </g>
+  <g>
+    <rect x="794" y="324" width="335" height="154" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+    <rect x="812" y="346" width="64" height="64" fill="#223226" stroke="#090a0d" stroke-width="3"/>
+    <text x="830" y="387" fill="#70d990" font-family="monospace" font-size="24" font-weight="700">GM</text>
+    <text x="894" y="360" fill="#f2f0dc" font-family="monospace" font-size="20" font-weight="700">Grove Maw</text>
+    <text x="894" y="389" fill="#aaa9b7" font-family="monospace" font-size="15">Mythic • iLvl 20</text>
+    <text x="812" y="446" fill="#777988" font-family="monospace" font-size="16">Locked dungeon</text>
+  </g>
+
+  <text x="78" y="532" fill="#e5b95f" font-family="monospace" font-size="18">3. Pick Part</text>
+  <rect x="78" y="552" width="250" height="64" fill="#29291f" stroke="#e5b95f" stroke-width="5"/>
+  <text x="124" y="592" fill="#f2f0dc" font-family="monospace" font-size="20">Part 1</text>
+  <rect x="352" y="552" width="250" height="64" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <text x="398" y="592" fill="#aaa9b7" font-family="monospace" font-size="20">Part 2</text>
+  <rect x="626" y="552" width="250" height="64" fill="#20222a" stroke="#41404a" stroke-width="4"/>
+  <text x="672" y="592" fill="#aaa9b7" font-family="monospace" font-size="20">Part 3</text>
+  <rect x="926" y="552" width="226" height="64" fill="#3a2618" stroke="#e5b95f" stroke-width="5"/>
+  <text x="991" y="592" fill="#f2f0dc" font-family="monospace" font-size="22" font-weight="700">Start</text>
+
+  <text x="78" y="662" fill="#aaa9b7" font-family="monospace" font-size="17">Idea D: submenu flow. Pick item level first, then only compatible dungeon cards appear.</text>
+</svg>

docs/ui-mockups/talent-effects-thor-bottom.svg

@@ -0,0 +1,67 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="620" height="540" viewBox="0 0 620 540" role="img" aria-label="Ayn Thor secondary display spell effect quick swap mockup">
+  <rect width="620" height="540" fill="#111219"/>
+  <rect x="16" y="16" width="588" height="48" fill="#20222d" stroke="#0a0b0e" stroke-width="3"/>
+  <text x="32" y="36" fill="#8aa0b7" font-family="monospace" font-size="11" font-weight="700">SPELL EFFECTS</text>
+  <text x="32" y="56" fill="#f5e6b2" font-family="monospace" font-size="18" font-weight="900">Quick Swap</text>
+  <text x="460" y="47" fill="#83d99b" font-family="monospace" font-size="13" font-weight="900">4/4 ACTIVE</text>
+
+  <g transform="translate(16 82)">
+    <rect width="588" height="118" fill="#191b25" stroke="#3a3944" stroke-width="2"/>
+    <text x="16" y="28" fill="#8aa0b7" font-family="monospace" font-size="10" font-weight="700">ACTIVE SLOTS</text>
+    <g transform="translate(14 46)">
+      <rect width="130" height="54" fill="#29291f" stroke="#e5b95f" stroke-width="3"/>
+      <text x="10" y="20" fill="#e5b95f" font-family="monospace" font-size="11" font-weight="900">LV 5</text>
+      <text x="10" y="39" fill="#f7f2d7" font-family="monospace" font-size="12" font-weight="900">Mend Renew</text>
+    </g>
+    <g transform="translate(154 46)">
+      <rect width="130" height="54" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="10" y="20" fill="#6da7df" font-family="monospace" font-size="11" font-weight="900">LV 10</text>
+      <text x="10" y="39" fill="#f7f2d7" font-family="monospace" font-size="12" font-weight="900">Rad Shield</text>
+    </g>
+    <g transform="translate(294 46)">
+      <rect width="130" height="54" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="10" y="20" fill="#4fb978" font-family="monospace" font-size="11" font-weight="900">LV 15</text>
+      <text x="10" y="39" fill="#f7f2d7" font-family="monospace" font-size="12" font-weight="900">Shield DR</text>
+    </g>
+    <g transform="translate(434 46)">
+      <rect width="130" height="54" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="10" y="20" fill="#b16dde" font-family="monospace" font-size="11" font-weight="900">LV 20</text>
+      <text x="10" y="39" fill="#f7f2d7" font-family="monospace" font-size="12" font-weight="900">Mend CD</text>
+    </g>
+  </g>
+
+  <g transform="translate(16 218)">
+    <rect width="278" height="286" fill="#191b25" stroke="#3a3944" stroke-width="2"/>
+    <text x="16" y="28" fill="#8aa0b7" font-family="monospace" font-size="10" font-weight="700">POOL</text>
+    <g transform="translate(14 46)">
+      <rect width="250" height="42" fill="#29291f" stroke="#e5b95f" stroke-width="3"/>
+      <text x="12" y="26" fill="#f5e6b2" font-family="monospace" font-size="13" font-weight="900">Mend applies Renew</text>
+    </g>
+    <g transform="translate(14 98)">
+      <rect width="250" height="42" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="12" y="26" fill="#f7f2d7" font-family="monospace" font-size="13" font-weight="900">Shield applies Renew</text>
+    </g>
+    <g transform="translate(14 150)">
+      <rect width="250" height="42" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="12" y="26" fill="#f7f2d7" font-family="monospace" font-size="13" font-weight="900">Mend adds Shield</text>
+    </g>
+    <g transform="translate(14 202)">
+      <rect width="250" height="42" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="12" y="26" fill="#f7f2d7" font-family="monospace" font-size="13" font-weight="900">Radiance Renew</text>
+    </g>
+  </g>
+
+  <g transform="translate(310 218)">
+    <rect width="294" height="286" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+    <text x="16" y="28" fill="#8aa0b7" font-family="monospace" font-size="10" font-weight="700">DETAIL</text>
+    <text x="16" y="58" fill="#f5e6b2" font-family="monospace" font-size="18" font-weight="900">Mend applies Renew</text>
+    <text x="16" y="92" fill="#d7dbe0" font-family="monospace" font-size="13">Mend also applies Renew to</text>
+    <text x="16" y="112" fill="#d7dbe0" font-family="monospace" font-size="13">the target.</text>
+    <text x="16" y="150" fill="#83d99b" font-family="monospace" font-size="12" font-weight="900">Rule: same HoT refreshes.</text>
+    <text x="16" y="172" fill="#83d99b" font-family="monospace" font-size="12" font-weight="900">Different HoTs coexist.</text>
+    <rect x="16" y="216" width="120" height="44" rx="3" fill="#e5b95f" stroke="#0a0b0e" stroke-width="3"/>
+    <text x="50" y="244" fill="#21180a" font-family="monospace" font-size="14" font-weight="900">Equip</text>
+    <rect x="154" y="216" width="120" height="44" rx="3" fill="#191b25" stroke="#3a3944" stroke-width="2"/>
+    <text x="184" y="244" fill="#f7f2d7" font-family="monospace" font-size="14" font-weight="900">Clear</text>
+  </g>
+</svg>

docs/ui-mockups/talent-effects-thor-main.svg

@@ -0,0 +1,90 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="960" height="540" viewBox="0 0 960 540" role="img" aria-label="Ayn Thor main display talent effect planner mockup">
+  <rect width="960" height="540" fill="#111219"/>
+  <rect x="20" y="18" width="920" height="50" fill="#20222d" stroke="#0a0b0e" stroke-width="3"/>
+  <text x="38" y="39" fill="#8aa0b7" font-family="monospace" font-size="12" font-weight="700">CHARACTER WORKSHOP</text>
+  <text x="38" y="59" fill="#f5e6b2" font-family="monospace" font-size="20" font-weight="900">Spell Effects</text>
+  <rect x="764" y="28" width="154" height="30" rx="3" fill="#e5b95f" stroke="#0a0b0e" stroke-width="3"/>
+  <text x="786" y="49" fill="#21180a" font-family="monospace" font-size="13" font-weight="900">Save Loadout</text>
+
+  <g transform="translate(20 88)">
+    <rect width="294" height="420" fill="#191b25" stroke="#3a3944" stroke-width="2"/>
+    <text x="18" y="28" fill="#8aa0b7" font-family="monospace" font-size="11" font-weight="700">UNLOCKED SLOTS</text>
+    <text x="18" y="53" fill="#f7f2d7" font-family="monospace" font-size="19" font-weight="900">4 active effects</text>
+
+    <g transform="translate(16 76)">
+      <rect width="262" height="58" fill="#29291f" stroke="#e5b95f" stroke-width="3"/>
+      <circle cx="29" cy="29" r="15" fill="#e5b95f"/>
+      <text x="22" y="34" fill="#21180a" font-family="monospace" font-size="13" font-weight="900">5</text>
+      <text x="56" y="25" fill="#f5e6b2" font-family="monospace" font-size="15" font-weight="900">Mend applies Renew</text>
+      <text x="56" y="45" fill="#83d99b" font-family="monospace" font-size="11">Selected</text>
+    </g>
+    <g transform="translate(16 148)">
+      <rect width="262" height="58" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <circle cx="29" cy="29" r="15" fill="#6da7df"/>
+      <text x="18" y="34" fill="#08111c" font-family="monospace" font-size="12" font-weight="900">10</text>
+      <text x="56" y="25" fill="#f7f2d7" font-family="monospace" font-size="15" font-weight="900">Radiance adds shield</text>
+      <text x="56" y="45" fill="#8aa0b7" font-family="monospace" font-size="11">30 percent strength</text>
+    </g>
+    <g transform="translate(16 220)">
+      <rect width="262" height="58" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <circle cx="29" cy="29" r="15" fill="#4fb978"/>
+      <text x="18" y="34" fill="#071408" font-family="monospace" font-size="12" font-weight="900">15</text>
+      <text x="56" y="25" fill="#f7f2d7" font-family="monospace" font-size="15" font-weight="900">Shielded takes less</text>
+      <text x="56" y="45" fill="#8aa0b7" font-family="monospace" font-size="11">20 percent damage cut</text>
+    </g>
+    <g transform="translate(16 292)">
+      <rect width="262" height="58" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <circle cx="29" cy="29" r="15" fill="#b16dde"/>
+      <text x="18" y="34" fill="#15071c" font-family="monospace" font-size="12" font-weight="900">20</text>
+      <text x="56" y="25" fill="#f7f2d7" font-family="monospace" font-size="15" font-weight="900">Mend lowers Radiance</text>
+      <text x="56" y="45" fill="#8aa0b7" font-family="monospace" font-size="11">-2 sec cooldown</text>
+    </g>
+  </g>
+
+  <g transform="translate(334 88)">
+    <rect width="606" height="286" fill="#191b25" stroke="#3a3944" stroke-width="2"/>
+    <text x="18" y="28" fill="#8aa0b7" font-family="monospace" font-size="11" font-weight="700">EFFECT POOL</text>
+    <text x="18" y="53" fill="#f7f2d7" font-family="monospace" font-size="19" font-weight="900">Pick effects, swap anytime</text>
+
+    <g transform="translate(18 76)">
+      <rect width="276" height="58" fill="#29291f" stroke="#e5b95f" stroke-width="3"/>
+      <text x="14" y="24" fill="#f5e6b2" font-family="monospace" font-size="14" font-weight="900">Mend applies Renew</text>
+      <text x="14" y="45" fill="#b7c3d0" font-family="monospace" font-size="11">Direct heal also applies Renew.</text>
+      <text x="226" y="24" fill="#83d99b" font-family="monospace" font-size="10" font-weight="900">ON</text>
+    </g>
+    <g transform="translate(312 76)">
+      <rect width="276" height="58" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="14" y="24" fill="#f7f2d7" font-family="monospace" font-size="14" font-weight="900">Shield applies Renew</text>
+      <text x="14" y="45" fill="#b7c3d0" font-family="monospace" font-size="11">Sun Ward adds a Renew effect.</text>
+    </g>
+    <g transform="translate(18 148)">
+      <rect width="276" height="58" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="14" y="24" fill="#f7f2d7" font-family="monospace" font-size="14" font-weight="900">Mend adds Shield</text>
+      <text x="14" y="45" fill="#b7c3d0" font-family="monospace" font-size="11">50 percent shield strength.</text>
+    </g>
+    <g transform="translate(312 148)">
+      <rect width="276" height="58" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="14" y="24" fill="#f7f2d7" font-family="monospace" font-size="14" font-weight="900">Radiance adds Shield</text>
+      <text x="14" y="45" fill="#b7c3d0" font-family="monospace" font-size="11">30 percent to affected allies.</text>
+    </g>
+    <g transform="translate(18 220)">
+      <rect width="276" height="46" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="14" y="20" fill="#f7f2d7" font-family="monospace" font-size="14" font-weight="900">Radiance applies Renew</text>
+      <text x="14" y="38" fill="#b7c3d0" font-family="monospace" font-size="11">50 percent duration.</text>
+    </g>
+    <g transform="translate(312 220)">
+      <rect width="276" height="46" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+      <text x="14" y="20" fill="#f7f2d7" font-family="monospace" font-size="14" font-weight="900">Shielded gets +healing</text>
+      <text x="14" y="38" fill="#b7c3d0" font-family="monospace" font-size="11">20 percent more healing.</text>
+    </g>
+  </g>
+
+  <g transform="translate(334 392)">
+    <rect width="606" height="116" fill="#20222d" stroke="#3a3944" stroke-width="2"/>
+    <text x="18" y="26" fill="#8aa0b7" font-family="monospace" font-size="11" font-weight="700">SELECTED EFFECT</text>
+    <text x="18" y="52" fill="#f5e6b2" font-family="monospace" font-size="20" font-weight="900">Mend applies Renew</text>
+    <text x="18" y="78" fill="#d7dbe0" font-family="monospace" font-size="13">Casting Mend also applies Renew to the same target. Renew refreshes itself; different HoTs coexist.</text>
+    <rect x="470" y="32" width="112" height="42" rx="3" fill="#e5b95f" stroke="#0a0b0e" stroke-width="3"/>
+    <text x="497" y="58" fill="#21180a" font-family="monospace" font-size="14" font-weight="900">Equip</text>
+  </g>
+</svg>

server/game-api.mjs

@@ -22,6 +22,7 @@ const bossImageContentTypes = {
 }
 const equipmentSlots = ['weapon', 'helmet', 'chest', 'gloves', 'boots', 'pants', 'ring', 'necklace', 'trinket']
 const componentSlot = 'component'
+const directCraftItemLevels = new Set([1, 10, 20, 25])
 const sessionCookieName = 'chronicle_session'
 const sessionLifetimeSeconds = 60 * 60 * 24 * 30
 const rateLimitBuckets = new Map()
@@ -232,6 +233,25 @@ function consumeRateLimit(key, limit, windowMs) {
   }
 }
 
+function catchUpExperienceReward(database, accountId, characterId, baseReward, currentExperience, currentLevel) {
+  const targetLevel = database.prepare(`
+    SELECT COALESCE(MAX(level), 0) AS level
+    FROM characters
+    WHERE account_id = ?
+      AND id != ?
+  `).get(accountId, characterId).level
+  if (targetLevel <= currentLevel) return baseReward
+  const targetExperience = database.prepare(`
+    SELECT experience_required AS experienceRequired
+    FROM level_progression
+    WHERE level = ?
+  `).get(targetLevel)?.experienceRequired ?? currentExperience
+  const gap = Math.max(0, targetExperience - currentExperience)
+  if (gap <= 0) return baseReward
+  const doubledBase = Math.min(baseReward, Math.ceil(gap / 2))
+  return doubledBase * 2 + (baseReward - doubledBase)
+}
+
 function normalizeUsername(value) {
   const username = String(value ?? '').trim()
   if (!/^[A-Za-z0-9_]{3,20}$/.test(username)) {
@@ -363,13 +383,6 @@ function initializeCharacter(database, accountId, characterName, classId) {
   ;[...starterSpells, null].slice(0, 6).forEach((spellId, index) => {
     insertSlot.run(characterId, index + 1, spellId)
   })
-  const insertItem = database.prepare(`
-    INSERT INTO character_inventory (character_id, item_id, quantity, equipped)
-    VALUES (?, ?, 1, ?)
-  `)
-  for (let itemId = 100; itemId <= 107; itemId += 1) {
-    insertItem.run(characterId, itemId, itemId === 107 ? 0 : 1)
-  }
   return characterId
 }
 
@@ -777,6 +790,15 @@ export function getProfile(database, characterId, accountId) {
     WHERE rank <= 10
     ORDER BY dungeonId, difficultyId, startPart, completedParts, rank
   `).all()
+  const dungeonCompletionCounts = new Map(database.prepare(`
+    SELECT dungeon_id AS dungeonId, COUNT(*) AS count
+    FROM dungeon_runs
+    WHERE character_id = ?
+      AND result = 'victory'
+      AND start_part = 1
+      AND completed_parts >= 1
+    GROUP BY dungeon_id
+  `).all(characterId).map((row) => [row.dungeonId, row.count]))
 
   const settings = Object.fromEntries(
     database.prepare('SELECT key, value FROM game_settings').all()
@@ -856,6 +878,7 @@ export function getProfile(database, characterId, accountId) {
     }),
     dungeons: dungeons.map((dungeon) => ({
       ...dungeon,
+      completionCount: dungeonCompletionCounts.get(dungeon.id) ?? 0,
       difficulties: dungeonDifficulties.filter(
         (difficulty) => difficulty.dungeonId === dungeon.id,
       ),
@@ -1692,11 +1715,17 @@ function craftItem(database, characterId, recipeId) {
       crafting_recipes.item_id AS itemId,
       crafting_recipes.difficulty_id AS difficultyId,
       crafting_recipes.source_dungeon_id AS sourceDungeonId,
-      crafting_recipes.source_encounter_id AS sourceEncounterId
+      crafting_recipes.source_encounter_id AS sourceEncounterId,
+      items.slot,
+      items.item_level AS itemLevel
     FROM crafting_recipes
+    JOIN items ON items.id = crafting_recipes.item_id
     WHERE crafting_recipes.id = ?
   `).get(recipeId)
   if (!recipe) throw new Error('That crafting recipe does not exist.')
+  if (!directCraftItemLevels.has(recipe.itemLevel)) {
+    throw new Error('Upgrade the previous item tier instead.')
+  }
 
   const components = database.prepare(`
     SELECT
@@ -1777,8 +1806,10 @@ function upgradeItem(database, characterId, itemId) {
     JOIN items ON items.id = crafting_recipes.item_id
     WHERE crafting_recipes.source_encounter_id = ?
       AND items.slot = ?
-      AND items.item_level = ?
+      AND items.item_level > ?
-  `).get(currentRecipe.sourceEncounterId, item.slot, item.itemLevel + 5)
+    ORDER BY items.item_level
+    LIMIT 1
+  `).get(currentRecipe.sourceEncounterId, item.slot, item.itemLevel)
   if (!targetRecipe) throw new Error('No upgrade is available for this item.')
 
   const components = database.prepare(`
@@ -1841,9 +1872,20 @@ function upgradeItem(database, characterId, itemId) {
   return getProfile(database, characterId)
 }
 
+function talentEffectCapacity(level) {
+  return Math.min(4, Math.max(0, Math.floor(level / 5)))
+}
+
+function talentEffectSource(effectType) {
+  if (effectType.startsWith('mend_')) return 'Mend'
+  if (effectType.startsWith('radiance_')) return 'Radiance'
+  if (effectType.startsWith('shield_') || effectType.startsWith('shielded_')) return 'Shield'
+  return effectType
+}
+
 function allocateTalent(database, characterId, talentId) {
   const character = database.prepare(`
-    SELECT class_id AS classId, talent_points AS talentPoints
+    SELECT class_id AS classId, level, talent_points AS talentPoints
     FROM characters
     WHERE id = ?
   `).get(characterId)
@@ -1855,7 +1897,8 @@ function allocateTalent(database, characterId, talentId) {
       max_rank AS maxRank,
       tier,
       prerequisite_talent_id AS prerequisiteTalentId,
-      prerequisite_rank AS prerequisiteRank
+      prerequisite_rank AS prerequisiteRank,
+      effect_type AS effectType
     FROM talents
     WHERE id = ?
   `).get(talentId)
@@ -1863,6 +1906,60 @@ function allocateTalent(database, characterId, talentId) {
   if (!talent || talent.classId !== character.classId) {
     throw new Error('That talent does not belong to the active class.')
   }
+
+  if (character.classId === 1) {
+    const currentRank = database.prepare(`
+      SELECT rank
+      FROM character_talents
+      WHERE character_id = ? AND talent_id = ?
+    `).get(characterId, talentId)?.rank ?? 0
+    database.exec('BEGIN')
+    try {
+      if (currentRank > 0) {
+        database.prepare(`
+          DELETE FROM character_talents
+          WHERE character_id = ? AND talent_id = ?
+        `).run(characterId, talentId)
+      } else {
+        const capacity = talentEffectCapacity(character.level)
+        if (capacity <= 0) throw new Error('Spell effects unlock at level 5.')
+        const activeTalents = database.prepare(`
+          SELECT
+            talents.id,
+            talents.name,
+            talents.effect_type AS effectType
+          FROM character_talents
+          JOIN talents ON talents.id = character_talents.talent_id
+          WHERE character_talents.character_id = ?
+            AND talents.class_id = ?
+            AND character_talents.rank > 0
+        `).all(characterId, character.classId)
+        const source = talentEffectSource(talent.effectType)
+        const sourceConflict = activeTalents.find(
+          (candidate) => candidate.id !== talentId && talentEffectSource(candidate.effectType) === source,
+        )
+        if (sourceConflict) {
+          throw new Error(`Only one ${source} spell effect can be active.`)
+        }
+        const activeCount = activeTalents.length
+        if (activeCount >= capacity) {
+          throw new Error(`Level ${character.level} allows ${capacity} active spell effect${capacity === 1 ? '' : 's'}.`)
+        }
+        database.prepare(`
+          INSERT INTO character_talents (character_id, talent_id, rank)
+          VALUES (?, ?, 1)
+          ON CONFLICT(character_id, talent_id)
+          DO UPDATE SET rank = 1
+        `).run(characterId, talentId)
+      }
+      database.exec('COMMIT')
+    } catch (error) {
+      database.exec('ROLLBACK')
+      throw error
+    }
+    return getProfile(database, characterId)
+  }
+
   if (character.talentPoints <= 0) {
     throw new Error('No talent points are available.')
   }
@@ -1941,11 +2038,13 @@ function resetTalents(database, characterId) {
       WHERE character_id = ?
         AND talent_id IN (SELECT id FROM talents WHERE class_id = ?)
     `).run(characterId, character.classId)
-    database.prepare(`
+    if (character.classId !== 1) {
-      UPDATE characters
+      database.prepare(`
-      SET talent_points = MIN(level, talent_points + ?)
+        UPDATE characters
-      WHERE id = ?
+        SET talent_points = MIN(level, talent_points + ?)
-    `).run(refunded, characterId)
+        WHERE id = ?
+      `).run(refunded, characterId)
+    }
     database.exec('COMMIT')
   } catch (error) {
     database.exec('ROLLBACK')
@@ -2016,12 +2115,21 @@ function completeDungeon(database, characterId, accountId, dungeonId, difficulty
   const completedPart = Math.min(Math.max(Number(runMetrics?.completedPart) || 1, 1), 3)
   const startPart = Math.min(Math.max(Number(runMetrics?.startPart) || 1, 1), 3)
   const completedParts = completedPart - startPart + 1
+  const rewardMultiplier = runMetrics?.hardMode ? 2 : 1
   const rawPartDurations = runMetrics?.partDurationSeconds
   const partDurationSeconds = Array.isArray(rawPartDurations) && rawPartDurations.length === 3
     ? rawPartDurations.map(Number)
     : null
-  const experienceReward = Math.round(
+  const baseExperienceReward = Math.round(
-    dungeon.experienceReward * dungeon.experienceMultiplier * completedPart,
+    dungeon.experienceReward * dungeon.experienceMultiplier * completedPart * rewardMultiplier,
+  )
+  const experienceReward = catchUpExperienceReward(
+    database,
+    accountId,
+    characterId,
+    baseExperienceReward,
+    character.experience,
+    character.level,
   )
   const newExperience = Math.min(character.experience + experienceReward, maxExperience)
   const newLevel = database.prepare(`
@@ -2119,17 +2227,18 @@ function completeDungeon(database, characterId, accountId, dungeonId, difficulty
     `).all(dungeonId, dungeon.completionItemLevel ?? dungeon.droppedItemLevel + 3)
     if (bonusItems.length > 0) {
       bonusItem = bonusItems[0]
+      const rewardQuantity = rewardMultiplier
       const previousQuantity = database.prepare(`
         SELECT quantity FROM character_inventory
         WHERE character_id = ? AND item_id = ?
       `).get(characterId, bonusItem.id)?.quantity ?? 0
       database.prepare(`
         INSERT INTO character_inventory (character_id, item_id, quantity, equipped)
-        VALUES (?, ?, 1, 0)
+        VALUES (?, ?, ?, 0)
         ON CONFLICT(character_id, item_id)
-        DO UPDATE SET quantity = quantity + 1
+        DO UPDATE SET quantity = quantity + ?
-      `).run(characterId, bonusItem.id)
+      `).run(characterId, bonusItem.id, rewardQuantity, rewardQuantity)
-      bonusItem = { ...bonusItem, quantity: 1, duplicate: previousQuantity > 0, quantityAfter: previousQuantity + 1 }
+      bonusItem = { ...bonusItem, quantity: rewardQuantity, duplicate: previousQuantity > 0, quantityAfter: previousQuantity + rewardQuantity }
     }
   }
 
@@ -2226,6 +2335,12 @@ function completeRoguelike(database, characterId, accountId, runMetrics) {
   let newExperience = character.experience
   let newLevel = character.level
   if (experienceMode === 'pvp-boss-quarter-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 currentLevelFloor = database.prepare(`
         SELECT experience_required AS experienceRequired
@@ -2240,7 +2355,8 @@ function completeRoguelike(database, characterId, accountId, runMetrics) {
           WHERE level = ?
         `).get(newLevel + 1).experienceRequired
       const levelBand = Math.max(1, nextLevelExperience - currentLevelFloor)
-      newExperience = Math.min(maxExperience, newExperience + Math.round(levelBand * 0.25))
+      const rewardRate = catchUpTargetLevel > newLevel ? 0.5 : 0.25
+      newExperience = Math.min(maxExperience, newExperience + Math.round(levelBand * rewardRate))
       newLevel = database.prepare(`
         SELECT MAX(level) AS level
         FROM level_progression
@@ -2248,9 +2364,17 @@ function completeRoguelike(database, characterId, accountId, runMetrics) {
       `).get(newExperience).level
     }
   } else {
-    const experienceReward = Math.round(
+    const baseExperienceReward = Math.round(
       dungeon.experienceReward * dungeon.experienceMultiplier * (encountersCleared / 3),
     )
+    const experienceReward = catchUpExperienceReward(
+      database,
+      accountId,
+      characterId,
+      baseExperienceReward,
+      character.experience,
+      character.level,
+    )
     newExperience = Math.min(character.experience + experienceReward, maxExperience)
     newLevel = database.prepare(`
       SELECT MAX(level) AS level

src/App.tsx

@@ -55,6 +55,7 @@ const MENU_ITEMS: Array<{
 
 const LAST_DIFFICULTY_KEY = 'i-want-to-heal:last-difficulty'
 const SHOW_LEADERBOARDS = false
+const ACTIVITY_PAGE_SIZE = 6
 
 function activityInitials(name: string) {
   return name
@@ -81,13 +82,14 @@ function App() {
     return Number.isFinite(saved) && saved > 0 ? saved : 1
   })
   const [selectedDungeonId, setSelectedDungeonId] = useState(1)
-  const [selectedRaidId, setSelectedRaidId] = useState(2)
+  const [selectedRaidId, setSelectedRaidId] = useState(20)
   const [roguelikeKind, setRoguelikeKind] = useState<'dungeon' | 'raid'>('dungeon')
   const [roguelikeVariant, setRoguelikeVariant] = useState<RoguelikeVariant>('pve')
   const [roguelikeUpgradeTiming, setRoguelikeUpgradeTiming] = useState<RoguelikeUpgradeTiming>('encounter')
   const [roguelikeAbilityLabelMode, setRoguelikeAbilityLabelMode] = useState<RoguelikeAbilityLabelMode>('ability')
   const [pvpContentType, setPvpContentType] = useState<PvpContentType>('dungeon')
-  const [selectedPart, setSelectedPart] = useState(1)
+  const [selectedMarathonMode, setSelectedMarathonMode] = useState(false)
+  const [activityPage, setActivityPage] = useState(0)
   const [combatContentId, setCombatContentId] = useState(1)
   const [leaderboardCategory, setLeaderboardCategory] = useState<'part_1' | 'part_2' | 'part_3' | 'full_run'>('part_1')
   const [showLoot, setShowLoot] = useState(false)
@@ -131,6 +133,13 @@ function App() {
     })
   }, [screen])
 
+  useEffect(() => {
+    if (!authChecked || !account || !profile || screen === 'combat') return
+    window.requestAnimationFrame(() => {
+      focusFirstControl()
+    })
+  }, [account, authChecked, profile, screen])
+
   useEffect(() => {
     window.localStorage.setItem(LAST_DIFFICULTY_KEY, String(selectedDifficultyId))
   }, [selectedDifficultyId])
@@ -148,6 +157,9 @@ function App() {
     setScreen('menu')
     setError('')
     setServerMessage('')
+    window.requestAnimationFrame(() => {
+      focusFirstControl()
+    })
   }
 
   async function signOut() {
@@ -220,17 +232,18 @@ function App() {
     const roguelikePool = profile.dungeons
       .filter((candidate) => candidate.contentType === roguelikeKind)
       .flatMap((candidate) => candidate.encounters)
-    const startPart = selectedPart
     return (
       <CombatScreen
         difficulty={difficulty}
         dungeon={dungeon}
+        hardMode={false}
+        marathonMode={selectedMarathonMode && combatContentId > 0}
         profile={profile}
         roguelikeMode={combatContentId < 0 ? roguelikeKind : undefined}
         roguelikeUpgradeTiming={combatContentId < 0 ? roguelikeUpgradeTiming : undefined}
         roguelikeAbilityLabelMode={combatContentId < 0 ? roguelikeAbilityLabelMode : undefined}
         roguelikeEncounterPool={combatContentId < 0 ? roguelikePool : undefined}
-        startPart={startPart}
+        startPart={1}
         onExit={() => {
           setScreen(combatContentId < 0 ? 'roguelike' : dungeon.contentType === 'raid' ? 'raids' : 'dungeons')
         }}
@@ -272,21 +285,56 @@ function App() {
     ?? dungeonOptions[0]!
   const raid = raidOptions.find((candidate) => candidate.id === selectedRaidId)
     ?? raidOptions[0]
-  const activity = screen === 'raids' && raid ? raid : dungeon
   const activityOptions = screen === 'raids' ? raidOptions : dungeonOptions
+  const startPveRoguelike = () => {
+    const baseDungeon = dungeonOptions[0]
+    const baseRaid = raidOptions[0]
+    if (roguelikeKind === 'raid') {
+      setCombatContentId(-2)
+      setSelectedDifficultyId(baseRaid?.difficulties[0]?.id ?? 101)
+    } else {
+      setCombatContentId(-1)
+      setSelectedDifficultyId(baseDungeon?.difficulties[0]?.id ?? 1)
+    }
+    setSelectedMarathonMode(false)
+    setScreen('combat')
+  }
+  const tierOptions = activityOptions
+    .flatMap((option) => option.difficulties)
+    .filter((difficulty, index, all) => (
+      all.findIndex((candidate) => candidate.droppedItemLevel === difficulty.droppedItemLevel) === index
+    ))
+    .sort((a, b) => a.droppedItemLevel - b.droppedItemLevel)
+  const savedDifficulty = profile.dungeons
+    .flatMap((option) => option.difficulties)
+    .find((candidate) => candidate.id === selectedDifficultyId)
+  const selectedTier = tierOptions.find((candidate) => (
+    candidate.droppedItemLevel === savedDifficulty?.droppedItemLevel
+    && profile.character.level >= candidate.unlockLevel
+  ))
+    ?? tierOptions.slice().reverse().find((candidate) => profile.character.level >= candidate.unlockLevel)
+    ?? tierOptions[0]
+  const selectedTierItemLevel = selectedTier?.droppedItemLevel ?? 0
+  const activityPageCount = Math.max(1, Math.ceil(activityOptions.length / ACTIVITY_PAGE_SIZE))
+  const currentActivityPage = Math.min(activityPage, activityPageCount - 1)
+  const pagedActivityOptions = activityOptions.slice(
+    currentActivityPage * ACTIVITY_PAGE_SIZE,
+    currentActivityPage * ACTIVITY_PAGE_SIZE + ACTIVITY_PAGE_SIZE,
+  )
+  const activityPageStart = activityOptions.length === 0
+    ? 0
+    : currentActivityPage * ACTIVITY_PAGE_SIZE + 1
+  const activityPageEnd = Math.min(activityOptions.length, (currentActivityPage + 1) * ACTIVITY_PAGE_SIZE)
+  const selectedActivityId = screen === 'raids' && raid ? raid.id : dungeon.id
+  const activity = activityOptions.find((candidate) => candidate.id === selectedActivityId)
+    ?? activityOptions[0]
+    ?? (screen === 'raids' && raid ? raid : dungeon)
   const selectedDifficulty = activity.difficulties.find(
-    (candidate) => candidate.id === selectedDifficultyId,
+    (candidate) => candidate.droppedItemLevel === selectedTierItemLevel,
   ) ?? activity.difficulties[0]
   const difficultyLocked = profile.character.level < selectedDifficulty.unlockLevel
-  const completedSections = activity.contentType === 'raid'
+  const activityCompletionCount = activity.completionCount ?? 0
-    ? profile.completedRaidPhases
+  const marathonUnlocked = activityCompletionCount >= 10
-    : profile.completedDungeonParts
-  const sectionName = activity.contentType === 'raid' ? 'Phase' : 'Part'
-  const parts = [
-    { part: 1, name: `${sectionName} 1`, encounterCount: 3, unlocked: true },
-    { part: 2, name: `${sectionName} 2`, encounterCount: 3, unlocked: completedSections >= 1 },
-    { part: 3, name: `${sectionName} 3`, encounterCount: 3, unlocked: completedSections >= 2 },
-  ]
   const cloudSync = getCloudSyncStatus()
   const canShowCloudSync = account.id !== -1 && cloudSync.available
   const lootPreviewEncounters = [...activity.encounters]
@@ -296,7 +344,7 @@ function App() {
       : a.sequence - b.sequence)
 
   return (
-    <main className="game-shell">
+    <main className={`game-shell ${screen === 'dungeons' || screen === 'raids' ? 'dungeon-shell' : ''} ${screen === 'customize' ? 'workshop-shell' : ''}`}>
       <header className="topbar app-header">
         <button
           className="brand-button"
@@ -393,84 +441,90 @@ function App() {
           </div>
           {roguelikeVariant === 'pve' && (
             <>
-          <div className="roguelike-option-panel">
+              <div className="roguelike-option-panel">
-            <div>
+                <div>
-              <p className="eyebrow">Upgrade Timing</p>
+                  <p className="eyebrow">Run Type</p>
-              <h2>Buff Drafts</h2>
+                  <h2>PvE Roguelike</h2>
-            </div>
+                </div>
-            <div className="roguelike-timing-row">
+                <div className="roguelike-timing-row">
-              <button
+                  <button
-                className={`text-button ${roguelikeUpgradeTiming === 'encounter' ? 'active' : ''}`}
+                    className={`text-button ${roguelikeKind === 'dungeon' ? 'active' : ''}`}
-                onClick={() => setRoguelikeUpgradeTiming('encounter')}
+                    onClick={() => setRoguelikeKind('dungeon')}
-                type="button"
+                    type="button"
-              >
+                  >
-                Every Encounter
+                    Dungeon
-              </button>
+                  </button>
-              <button
+                  <button
-                className={`text-button ${roguelikeUpgradeTiming === 'boss' ? 'active' : ''}`}
+                    className={`text-button ${roguelikeKind === 'raid' ? 'active' : ''}`}
-                onClick={() => setRoguelikeUpgradeTiming('boss')}
+                    onClick={() => setRoguelikeKind('raid')}
-                type="button"
+                    type="button"
-              >
+                  >
-                Boss Only
+                    Raid
-              </button>
+                  </button>
-            </div>
+                </div>
-          </div>
+              </div>
-          <div className="roguelike-option-panel">
+              <div className="roguelike-option-panel">
-            <div>
+                <div>
-              <p className="eyebrow">Upgrade Labels</p>
+                  <p className="eyebrow">Upgrade Timing</p>
-              <h2>Display Mode</h2>
+                  <h2>Buff Drafts</h2>
-            </div>
+                </div>
-            <div className="roguelike-timing-row">
+                <div className="roguelike-timing-row">
-              <button
+                  <button
-                className={`text-button ${roguelikeAbilityLabelMode === 'ability' ? 'active' : ''}`}
+                    className={`text-button ${roguelikeUpgradeTiming === 'encounter' ? 'active' : ''}`}
-                onClick={() => setRoguelikeAbilityLabelMode('ability')}
+                    onClick={() => setRoguelikeUpgradeTiming('encounter')}
-                type="button"
+                    type="button"
-              >
+                  >
-                Ability Names
+                    Every Encounter
-              </button>
+                  </button>
-              <button
+                  <button
-                className={`text-button ${roguelikeAbilityLabelMode === 'slot' ? 'active' : ''}`}
+                    className={`text-button ${roguelikeUpgradeTiming === 'boss' ? 'active' : ''}`}
-                onClick={() => setRoguelikeAbilityLabelMode('slot')}
+                    onClick={() => setRoguelikeUpgradeTiming('boss')}
-                type="button"
+                    type="button"
-              >
+                  >
-                Slot Names
+                    Boss Only
-              </button>
+                  </button>
-            </div>
+                </div>
-          </div>
+              </div>
-          <div className="roguelike-mode-grid">
+              <div className="roguelike-option-panel">
-            <button
+                <div>
-              className="menu-card"
+                  <p className="eyebrow">Upgrade Labels</p>
-              onClick={() => {
+                  <h2>Display Mode</h2>
-                const baseDungeon = dungeonOptions[0]
+                </div>
-                setRoguelikeKind('dungeon')
+                <div className="roguelike-timing-row">
-                setCombatContentId(-1)
+                  <button
-                setSelectedDifficultyId(baseDungeon.difficulties[0]?.id ?? 1)
+                    className={`text-button ${roguelikeAbilityLabelMode === 'ability' ? 'active' : ''}`}
-                setSelectedPart(1)
+                    onClick={() => setRoguelikeAbilityLabelMode('ability')}
-                setScreen('combat')
+                    type="button"
-              }}
+                  >
-              type="button"
+                    Ability Names
-            >
+                  </button>
-              <span>D</span>
+                  <button
-              <strong>Dungeon Roguelike</strong>
+                    className={`text-button ${roguelikeAbilityLabelMode === 'slot' ? 'active' : ''}`}
-              <small>Five-player party. Two random trash enemies and a boss with a lighter early ramp.</small>
+                    onClick={() => setRoguelikeAbilityLabelMode('slot')}
-            </button>
+                    type="button"
-            <button
+                  >
-              className="menu-card"
+                    Slot Names
-              onClick={() => {
+                  </button>
-                const baseRaid = raidOptions[0]
+                </div>
-                setRoguelikeKind('raid')
+              </div>
-                setCombatContentId(-2)
+              <div className="menu-card pvp-queue-panel">
-                setSelectedDifficultyId(baseRaid?.difficulties[0]?.id ?? 101)
+                <span>{roguelikeKind === 'raid' ? 'R' : 'D'}</span>
-                setSelectedPart(1)
+                <div>
-                setScreen('combat')
+                  <strong>{roguelikeKind === 'raid' ? 'Raid Roguelike' : 'Dungeon Roguelike'}</strong>
-              }}
+                  <small>
-              type="button"
+                    {roguelikeKind === 'raid'
-            >
+                      ? 'Ten-player party. Raid pools, lighter early scaling, and the same upgrade draft.'
-              <span>R</span>
+                      : 'Five-player party. Two random trash enemies and a boss with a lighter early ramp.'}
-              <strong>Raid Roguelike</strong>
+                  </small>
-              <small>Ten-player party. Raid pools, lighter early scaling, and the same upgrade draft.</small>
+                </div>
-            </button>
+                <button
-          </div>
+                  className="text-button"
+                  onClick={startPveRoguelike}
+                  type="button"
+                >
+                  Start Run
+                </button>
+              </div>
             </>
           )}
           {roguelikeVariant === 'pvp' && (
@@ -554,108 +608,200 @@ function App() {
       )}
 
       {(screen === 'dungeons' || screen === 'raids') && (
-        <section className="content-screen">
+        <section className="content-screen dungeon-run-screen">
           <ScreenHeading
             eyebrow="Adventure"
             title={activity.contentType === 'raid' ? 'Raids' : 'Dungeons'}
             onBack={() => setScreen('menu')}
           />
-          <article className="dungeon-card">
+          <div className="dungeon-run-board">
-            <div className={`dungeon-art ${activity.contentType === 'raid' ? 'raid-art' : ''}`}>
+            <div className="dungeon-run-main">
-              {activityInitials(activity.name)}
+              <article className="run-summary-card dungeon-focus-card">
+                <div className={`dungeon-art ${activity.contentType === 'raid' ? 'raid-art' : ''}`}>
+                  {activityInitials(activity.name)}
+                </div>
+                <div className="run-summary-copy">
+                  <p className="eyebrow">Selected Run</p>
+                  <h2>{activity.name}</h2>
+                  <p>{activity.description}</p>
+                  <div className="tag-row">
+                    <span>Level {activity.recommendedLevel}</span>
+                    <span>{activity.partySize} Players</span>
+                    <span>{selectedDifficulty.name}</span>
+                    <span>iLvl {selectedDifficulty.droppedItemLevel}</span>
+                    <span>{Math.round(activity.experienceReward * selectedDifficulty.experienceMultiplier)} XP</span>
+                  </div>
+                </div>
+              </article>
+
+              <section className="run-setup-panel dungeon-choice-panel">
+                <div className="run-setup-heading">
+                  <div>
+                    <p className="eyebrow">Pick Run</p>
+                    <h2>{screen === 'raids' ? 'Raid' : 'Dungeon'}</h2>
+                  </div>
+                  {activityPageCount > 1 ? (
+                    <div className="activity-pager" aria-label={`${screen === 'raids' ? 'Raid' : 'Dungeon'} pages`}>
+                      <button
+                        disabled={currentActivityPage === 0}
+                        onClick={() => setActivityPage((page) => Math.max(0, page - 1))}
+                        type="button"
+                      >
+                        Prev
+                      </button>
+                      <span>{activityPageStart}-{activityPageEnd} of {activityOptions.length}</span>
+                      <button
+                        disabled={currentActivityPage >= activityPageCount - 1}
+                        onClick={() => setActivityPage((page) => Math.min(activityPageCount - 1, page + 1))}
+                        type="button"
+                      >
+                        Next
+                      </button>
+                    </div>
+                  ) : (
+                    <small>{selectedDifficulty.name} rewards iLvl {selectedDifficulty.droppedItemLevel} components.</small>
+                  )}
+                </div>
+                <div className="activity-card-grid dungeon-choice-grid">
+                  {pagedActivityOptions.map((candidate) => {
+                    const difficulty = candidate.difficulties.find(
+                      (option) => option.droppedItemLevel === selectedDifficulty.droppedItemLevel,
+                    ) ?? candidate.difficulties[0]
+                    const locked = profile.character.level < difficulty.unlockLevel
+                    const selected = candidate.id === activity.id
+                    return (
+                      <button
+                        className={`activity-card ${selected ? 'selected' : ''} ${locked ? 'locked' : ''}`}
+                        disabled={locked}
+                        key={candidate.id}
+                        onClick={() => {
+                          if (screen === 'raids') setSelectedRaidId(candidate.id)
+                          else setSelectedDungeonId(candidate.id)
+                          setSelectedDifficultyId(difficulty.id)
+                        }}
+                        type="button"
+                      >
+                        <span className={`dungeon-art ${candidate.contentType === 'raid' ? 'raid-art' : ''}`}>
+                          {activityInitials(candidate.name)}
+                        </span>
+                        <strong>{candidate.name}</strong>
+                        <small>{candidate.locationName}</small>
+                        <i>
+                          Level {candidate.recommendedLevel} | {candidate.partySize} Players
+                        </i>
+                      </button>
+                    )
+                  })}
+                </div>
+              </section>
             </div>
-            <div>
+
-              <p className="eyebrow">{activity.locationName}</p>
+            <aside className="dungeon-setup-rail">
-              <h2>{activity.name}</h2>
+              <section className="run-setup-panel tier-setup-panel">
-              <p>{activity.description}</p>
+                <div className="run-setup-heading">
-              <div className="tag-row">
+                  <div>
-                <span>Level {activity.recommendedLevel}</span>
+                    <p className="eyebrow">Item Level</p>
-                <span>{activity.partySize} Players</span>
+                    <h2>Tier</h2>
-                <span>{selectedDifficulty.name}</span>
+                  </div>
-                <span>Component Level {selectedDifficulty.droppedItemLevel}</span>
+                  <small>{screen === 'raids' ? 'Raid' : 'Dungeon'} tiers unlock by level.</small>
-                <span>{Math.round(activity.experienceReward * selectedDifficulty.experienceMultiplier)} XP</span>
+                </div>
+                <div className="tier-grid">
+                  {tierOptions.map((difficulty) => {
+                    const locked = profile.character.level < difficulty.unlockLevel
+                    const selected = difficulty.droppedItemLevel === selectedDifficulty.droppedItemLevel
+                    return (
+                      <button
+                        className={`${selected ? 'selected' : ''} ${locked ? 'locked' : ''}`}
+                        disabled={locked}
+                        key={difficulty.id}
+                        onClick={() => {
+                          setActivityPage(0)
+                          const nextActivity = activity.difficulties.some(
+                            (candidate) => candidate.droppedItemLevel === difficulty.droppedItemLevel,
+                          )
+                            ? activity
+                            : activityOptions.find((option) =>
+                              option.difficulties.some((candidate) => candidate.droppedItemLevel === difficulty.droppedItemLevel),
+                            )
+                          if (nextActivity) {
+                            if (screen === 'raids') setSelectedRaidId(nextActivity.id)
+                            else setSelectedDungeonId(nextActivity.id)
+                            const nextDifficulty = nextActivity.difficulties.find(
+                              (candidate) => candidate.droppedItemLevel === difficulty.droppedItemLevel,
+                            )
+                            if (nextDifficulty) setSelectedDifficultyId(nextDifficulty.id)
+                          }
+                        }}
+                        type="button"
+                      >
+                        <strong>iLvl {difficulty.droppedItemLevel}</strong>
+                        <span>{locked ? `Level ${difficulty.unlockLevel}` : difficulty.name}</span>
+                      </button>
+                    )
+                  })}
+                </div>
+              </section>
+
+              <section className="run-setup-panel part-setup-panel">
+                <div className="run-setup-heading">
+                  <div>
+                    <p className="eyebrow">Start</p>
+                    <h2>Run</h2>
+                  </div>
+                  <small>
+                    {difficultyLocked
+                      ? `Unlocks at level ${selectedDifficulty.unlockLevel}`
+                      : marathonUnlocked
+                        ? 'Marathon keeps health and mana between boss kills.'
+                        : `Marathon unlocks after 10 clears (${activityCompletionCount}/10).`}
+                  </small>
+                </div>
+                <div className="part-picker">
+                  <button
+                    className="primary-button selected-part"
+                    disabled={difficultyLocked}
+                    onClick={() => {
+                      setSelectedMarathonMode(false)
+                      setCombatContentId(activity.id)
+                      setSelectedDifficultyId(selectedDifficulty.id)
+                      setScreen('combat')
+                    }}
+                    type="button"
+                  >
+                    Start Hunt
+                  </button>
+                  <button
+                    className={`primary-button ${selectedMarathonMode ? 'selected-part' : ''} ${!marathonUnlocked ? 'locked' : ''}`}
+                    disabled={difficultyLocked || !marathonUnlocked}
+                    onClick={() => {
+                      setSelectedMarathonMode(true)
+                      setCombatContentId(activity.id)
+                      setSelectedDifficultyId(selectedDifficulty.id)
+                      setScreen('combat')
+                    }}
+                    type="button"
+                  >
+                    Marathon
+                  </button>
+                </div>
+              </section>
+
+              <div className="difficulty-section compact-difficulty-section">
+                <div className={`difficulty-summary ${difficultyLocked ? 'locked' : ''}`}>
+                  <div>
+                    <strong>{selectedDifficulty.name}</strong>
+                    <small>{difficultyLocked ? `Unlocks at level ${selectedDifficulty.unlockLevel}` : selectedDifficulty.description}</small>
+                  </div>
+                  <dl>
+                    <div><dt>Health</dt><dd>{selectedDifficulty.healthMultiplier.toFixed(2)}x</dd></div>
+                    <div><dt>Damage</dt><dd>{selectedDifficulty.damageMultiplier.toFixed(2)}x</dd></div>
+                    <div><dt>XP</dt><dd>{selectedDifficulty.experienceMultiplier.toFixed(1)}x</dd></div>
+                    <div><dt>Loot</dt><dd>iLvl {selectedDifficulty.droppedItemLevel}</dd></div>
+                  </dl>
+                </div>
               </div>
-            </div>
+
-            {activityOptions.length > 1 && (
+              <div className="loot-preview-section">
-              <label className="activity-select">
-                <span>{activity.contentType === 'raid' ? 'Raid' : 'Dungeon'}</span>
-                <select
-                  value={activity.id}
-                  onChange={(event) => {
-                    const nextActivityId = Number(event.target.value)
-                    const nextActivity = activityOptions.find((candidate) => candidate.id === nextActivityId)
-                    if (screen === 'raids') setSelectedRaidId(nextActivityId)
-                    else setSelectedDungeonId(nextActivityId)
-                    if (nextActivity?.difficulties[0]) {
-                      setSelectedDifficultyId(nextActivity.difficulties[0].id)
-                    }
-                  }}
-                >
-                  {activityOptions.map((candidate) => (
-                    <option key={candidate.id} value={candidate.id}>{candidate.name}</option>
-                  ))}
-                </select>
-              </label>
-            )}
-            <div className="part-buttons">
-              {parts.map((p) => (
-                <button
-                  key={p.part}
-                  className={`primary-button ${selectedPart === p.part ? 'selected-part' : ''} ${!p.unlocked ? 'locked' : ''}`}
-                  disabled={difficultyLocked || !p.unlocked}
-                  onClick={() => {
-                    setSelectedPart(p.part)
-                    setCombatContentId(activity.id)
-                    setScreen('combat')
-                  }}
-                  type="button"
-                >
-                  {p.name}
-                </button>
-              ))}
-            </div>
-          </article>
-          <div className="difficulty-section compact-difficulty-section">
-            <div className="difficulty-select-row">
-              <div>
-                <p className="eyebrow">Challenge Tier</p>
-                <h2>Difficulty</h2>
-              </div>
-              <label>
-                <span>Select</span>
-                <select
-                  value={selectedDifficulty.id}
-                  onChange={(event) => setSelectedDifficultyId(Number(event.target.value))}
-                >
-                  {activity.difficulties.map((difficulty, index) => (
-                    <option
-                      disabled={profile.character.level < difficulty.unlockLevel}
-                      key={difficulty.id}
-                      value={difficulty.id}
-                    >
-                      {index + 1}. {difficulty.name}
-                      {profile.character.level < difficulty.unlockLevel
-                        ? ` - Level ${difficulty.unlockLevel}`
-                        : ''}
-                    </option>
-                  ))}
-                </select>
-              </label>
-            </div>
-            <div className={`difficulty-summary ${difficultyLocked ? 'locked' : ''}`}>
-              <div>
-                <strong>{selectedDifficulty.name}</strong>
-                <small>{difficultyLocked ? `Unlocks at level ${selectedDifficulty.unlockLevel}` : selectedDifficulty.description}</small>
-              </div>
-              <dl>
-                <div><dt>Health</dt><dd>{selectedDifficulty.healthMultiplier.toFixed(2)}x</dd></div>
-                <div><dt>Damage</dt><dd>{selectedDifficulty.damageMultiplier.toFixed(2)}x</dd></div>
-                <div><dt>XP</dt><dd>{selectedDifficulty.experienceMultiplier.toFixed(1)}x</dd></div>
-                <div><dt>Components</dt><dd>iLvl {selectedDifficulty.droppedItemLevel}</dd></div>
-              </dl>
-            </div>
-          </div>
-          <div className="loot-preview-section">
             <div className="equipment-heading toggle-heading">
               <div>
                 <p className="eyebrow">Encounter Rewards</p>
@@ -722,9 +868,9 @@ function App() {
                 </div>
               </>
             )}
-          </div>
+              </div>
-          {SHOW_LEADERBOARDS && (
+              {SHOW_LEADERBOARDS && (
-          <div className="leaderboard-section">
+              <div className="leaderboard-section">
             <div className="equipment-heading toggle-heading">
               <div>
                 <p className="eyebrow">Efficiency Rankings</p>
@@ -749,10 +895,10 @@ function App() {
                 </p>
                 <div className="leaderboard-tabs">
                   {([
-                    { key: 'part_1', label: `${sectionName} 1` },
+                    { key: 'part_1', label: 'Run' },
-                    { key: 'part_2', label: `${sectionName} 2` },
+                    { key: 'part_2', label: 'Legacy 2' },
-                    { key: 'part_3', label: `${sectionName} 3` },
+                    { key: 'part_3', label: 'Legacy 3' },
-                    { key: 'full_run', label: 'Full Run' },
+                    { key: 'full_run', label: 'Legacy Full' },
                   ] as const).map((tab) => (
                     <button
                       key={tab.key}
@@ -801,8 +947,10 @@ function App() {
                 </div>
               </>
             )}
+              </div>
+              )}
+            </aside>
           </div>
-          )}
         </section>
       )}
 

src/components/CustomizeScreen.tsx

@@ -4,6 +4,7 @@ import {
   type CharacterProfile,
   type GameClass,
 } from '../profile'
+import { useDualScreen, useDualScreenWorkshopPublisher, type DualScreenWorkshopState } from '../dualScreen'
 import { EquipmentScreen } from './EquipmentScreen'
 import { TalentScreen } from './TalentScreen'
 
@@ -14,7 +15,8 @@ type Props = {
 }
 
 export function CustomizeScreen({ profile, onBack, onSaved }: Props) {
-  const [activeTab, setActiveTab] = useState<'equipment' | 'talents' | 'class'>('class')
+  const [activeTab, setActiveTab] = useState<'equipment' | 'crafting' | 'talents' | 'class'>('class')
+  const { enabled: dualScreenEnabled } = useDualScreen()
   const [classId, setClassId] = useState(profile.character.classId)
   const [slots, setSlots] = useState<Array<number | null>>(profile.abilitySlots)
   const [selectedSlot, setSelectedSlot] = useState(0)
@@ -38,7 +40,7 @@ export function CustomizeScreen({ profile, onBack, onSaved }: Props) {
   function chooseClass(nextClass: GameClass) {
     const starterAbilities = nextClass.spells
       .filter((ability) => ability.unlockLevel <= profile.character.level)
-      .slice(0, 5)
+      .slice(0, 6)
       .map((ability) => ability.id)
     setClassId(nextClass.id)
     setSlots([...starterAbilities, ...Array(6 - starterAbilities.length).fill(null)])
@@ -63,6 +65,29 @@ export function CustomizeScreen({ profile, onBack, onSaved }: Props) {
     )
   }
 
+  const classWorkshopState = useMemo<DualScreenWorkshopState | null>(() => {
+    if (activeTab !== 'class') return null
+    return {
+      mode: 'class',
+      title: 'Ability Library',
+      subtitle: gameClass.name,
+      summary: `Selected slot ${selectedSlot + 1}. ${message || 'Choose an ability for the active loadout.'}`,
+      items: gameClass.spells.map((ability) => {
+        const locked = ability.unlockLevel > profile.character.level
+        const equipped = slots.includes(ability.id)
+        return {
+          glyph: locked ? 'L' : ability.glyph,
+          title: ability.name,
+          meta: locked ? `Level ${ability.unlockLevel}` : `${ability.cost} ${gameClass.resourceName}`,
+          detail: ability.description,
+          status: equipped ? 'Equipped' : locked ? 'Locked' : '',
+        }
+      }),
+    }
+  }, [activeTab, gameClass, message, profile.character.level, selectedSlot, slots])
+
+  useDualScreenWorkshopPublisher(classWorkshopState, dualScreenEnabled)
+
   async function persistChanges() {
     saveScroll()
     setSaving(true)
@@ -80,7 +105,7 @@ export function CustomizeScreen({ profile, onBack, onSaved }: Props) {
 
   return (
     <section className="content-screen customize-screen">
-      <div className="screen-heading">
+      <div className="screen-heading customize-heading">
         <div>
           <p className="eyebrow">Character Workshop</p>
           <h1>Customize Character</h1>
@@ -89,8 +114,10 @@ export function CustomizeScreen({ profile, onBack, onSaved }: Props) {
       </div>
 
       <div className="customize-tabs" role="tablist" aria-label="Customize character sections">
+        <button className="back-button customize-tab-back" onClick={onBack} type="button">Back</button>
         {([
           { key: 'equipment', label: 'Equipment' },
+          { key: 'crafting', label: 'Crafting' },
           { key: 'talents', label: 'Talents' },
           { key: 'class', label: 'Class' },
         ] as const).map((tab) => (
@@ -110,6 +137,18 @@ export function CustomizeScreen({ profile, onBack, onSaved }: Props) {
       {activeTab === 'equipment' && (
         <EquipmentScreen
           embedded
+          mode="equipment"
+          showModeTabs={false}
+          profile={profile}
+          onUpdated={onSaved}
+        />
+      )}
+
+      {activeTab === 'crafting' && (
+        <EquipmentScreen
+          embedded
+          mode="crafting"
+          showModeTabs={false}
           profile={profile}
           onUpdated={onSaved}
         />

src/components/EquipmentScreen.tsx

@@ -9,6 +9,7 @@ import {
   type EquipmentSlot,
   type Item,
 } from '../profile'
+import { useDualScreen, useDualScreenWorkshopPublisher, type DualScreenWorkshopState } from '../dualScreen'
 
 const SLOT_LABELS: Record<EquipmentSlot, string> = {
   weapon: 'Weapon',
@@ -24,16 +25,29 @@ const SLOT_LABELS: Record<EquipmentSlot, string> = {
 }
 
 const EQUIPMENT_LIST_PAGE_SIZE = 3
-const CRAFTING_LIST_PAGE_SIZE = 6
+const CRAFTING_LIST_PAGE_SIZE = 3
+const CRAFTING_FILTER_SLOTS = (Object.keys(SLOT_LABELS) as EquipmentSlot[])
+  .filter((slot) => slot !== 'component')
+const DIRECT_CRAFT_ITEM_LEVELS = new Set([1, 10, 20, 25])
 
 type Props = {
   profile: CharacterProfile
   onBack?: () => void
   onUpdated: (profile: CharacterProfile) => void
   embedded?: boolean
+  mode?: 'equipment' | 'crafting'
+  showModeTabs?: boolean
 }
 
-export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }: Props) {
+export function EquipmentScreen({
+  profile,
+  onBack,
+  onUpdated,
+  embedded = false,
+  mode,
+  showModeTabs = true,
+}: Props) {
+  const { enabled: dualScreenEnabled } = useDualScreen()
   const totalItemCount = profile.inventory.reduce(
     (total, item) => total + item.quantity,
     0,
@@ -49,27 +63,35 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
   const [crafting, setCrafting] = useState(false)
   const [upgrading, setUpgrading] = useState(false)
   const [showSetBonuses, setShowSetBonuses] = useState(false)
-  const [equipmentTab, setEquipmentTab] = useState<'equipment' | 'crafting'>('equipment')
+  const [equipmentTab, setEquipmentTab] = useState<'equipment' | 'crafting'>(mode ?? 'equipment')
   const [inventoryPage, setInventoryPage] = useState(0)
   const [recipePage, setRecipePage] = useState(0)
   const [message, setMessage] = useState('')
   const scrollRef = useRef<number>(0)
   const selectedItem = profile.inventory.find((item) => item.id === selectedItemId)
-  const firstRecipe = profile.craftingRecipes.find((recipe) => recipe.canCraft)
+  const craftableRecipes = profile.craftingRecipes.filter((recipe) =>
-    ?? profile.craftingRecipes[0]
+    DIRECT_CRAFT_ITEM_LEVELS.has(recipe.item.itemLevel),
+  )
+  const firstRecipe = craftableRecipes.find((recipe) => recipe.canCraft)
+    ?? craftableRecipes[0]
   const [selectedRecipeId, setSelectedRecipeId] = useState<number | null>(
     firstRecipe?.id ?? null,
   )
   const selectedRecipe = profile.craftingRecipes.find((recipe) => recipe.id === selectedRecipeId)
+  const selectedRecipeRequiresUpgrade = selectedRecipe
+    ? !DIRECT_CRAFT_ITEM_LEVELS.has(selectedRecipe.item.itemLevel)
+    : false
   const selectedItemRecipe = selectedItem
     ? profile.craftingRecipes.find((recipe) => recipe.item.id === selectedItem.id)
     : undefined
   const upgradeRecipe = selectedItem && selectedItemRecipe
-    ? profile.craftingRecipes.find((recipe) =>
+    ? profile.craftingRecipes
-      recipe.sourceEncounterId === selectedItemRecipe.sourceEncounterId
+      .filter((recipe) =>
-      && recipe.item.slot === selectedItem.slot
+        recipe.sourceEncounterId === selectedItemRecipe.sourceEncounterId
-      && recipe.item.itemLevel === selectedItem.itemLevel + 5,
+        && recipe.item.slot === selectedItem.slot
-    )
+        && recipe.item.itemLevel > selectedItem.itemLevel,
+      )
+      .sort((left, right) => left.item.itemLevel - right.item.itemLevel)[0]
     : undefined
   const equippedBySlot = useMemo(
     () => new Map(
@@ -104,12 +126,14 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
   const [slotFilter, setSlotFilter] = useState<EquipmentSlot | 'all'>('all')
   const [levelFilter, setLevelFilter] = useState<number | null>(null)
   const availableLevels = useMemo(
-    () => [...new Set(profile.craftingRecipes.map((r) => r.item.itemLevel))].sort((a, b) => b - a),
+    () => [...new Set(profile.craftingRecipes
+      .filter((r) => DIRECT_CRAFT_ITEM_LEVELS.has(r.item.itemLevel))
+      .map((r) => r.item.itemLevel))].sort((a, b) => b - a),
     [profile.craftingRecipes],
   )
   const filteredRecipes = useMemo(
     () => {
-      let result = [...profile.craftingRecipes]
+      let result = profile.craftingRecipes.filter((r) => DIRECT_CRAFT_ITEM_LEVELS.has(r.item.itemLevel))
       if (slotFilter !== 'all') result = result.filter((r) => r.item.slot === slotFilter)
       if (levelFilter !== null) result = result.filter((r) => r.item.itemLevel === levelFilter)
       result.sort((a, b) => b.item.itemLevel - a.item.itemLevel)
@@ -117,6 +141,19 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
     },
     [profile.craftingRecipes, slotFilter, levelFilter],
   )
+  const readyRecipeCount = filteredRecipes.filter((recipe) => recipe.canCraft).length
+  const slotRecipeCounts = useMemo(
+    () => new Map(
+      (Object.keys(SLOT_LABELS) as EquipmentSlot[]).map((slot) => [
+        slot,
+        profile.craftingRecipes.filter((recipe) =>
+          recipe.item.slot === slot
+          && DIRECT_CRAFT_ITEM_LEVELS.has(recipe.item.itemLevel),
+        ).length,
+      ]),
+    ),
+    [profile.craftingRecipes],
+  )
   const recipePageCount = Math.max(
     1,
     Math.ceil(filteredRecipes.length / CRAFTING_LIST_PAGE_SIZE),
@@ -138,12 +175,26 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
     setRecipePage((current) => Math.min(current, recipePageCount - 1))
   }, [recipePageCount])
 
+  useEffect(() => {
+    if (filteredRecipes.length === 0) {
+      setSelectedRecipeId(null)
+      return
+    }
+    if (!filteredRecipes.some((recipe) => recipe.id === selectedRecipeId)) {
+      setSelectedRecipeId(filteredRecipes[0].id)
+    }
+  }, [filteredRecipes, selectedRecipeId])
+
   useEffect(() => {
     if (equipmentTab === 'crafting') {
       loadProfile().then((fresh) => onUpdated(fresh)).catch(() => {})
     }
   }, [equipmentTab])
 
+  useEffect(() => {
+    if (mode) setEquipmentTab(mode)
+  }, [mode])
+
   function saveScroll() {
     scrollRef.current = window.scrollY
   }
@@ -218,6 +269,143 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
     }
   }
 
+  function renderEquipmentActions() {
+    if (!selectedItem) {
+      return <p>Select an item to inspect it.</p>
+    }
+    if (selectedItem.slot === 'component') {
+      return <p className="component-note">Used in crafting.</p>
+    }
+    return (
+      <>
+        <ComparisonDelta selected={selectedItem} equipped={comparisonItem} />
+        <button
+          className="primary-button"
+          disabled={selectedItem.equipped || equipping || breakingDown || upgrading}
+          onClick={equipSelected}
+          type="button"
+        >
+          {selectedItem.equipped ? 'Equipped' : equipping ? 'Equipping...' : 'Equip Item'}
+        </button>
+        {upgradeRecipe && (
+          <button
+            className="primary-button"
+            disabled={!upgradeRecipe.canCraft || equipping || breakingDown || upgrading}
+            onClick={upgradeSelected}
+            type="button"
+          >
+            {upgrading ? 'Upgrading...' : `Upgrade to iLvl ${upgradeRecipe.item.itemLevel}`}
+          </button>
+        )}
+        {(!selectedItem.equipped || selectedItem.quantity > 1) && (
+          <button
+            className="breakdown-button"
+            disabled={equipping || breakingDown || upgrading}
+            onClick={breakdownSelected}
+            type="button"
+          >
+            {breakingDown
+              ? 'Breaking Down...'
+              : selectedItem.quantity > 1
+                ? 'Break Down Duplicate'
+                : 'Break Down'}
+          </button>
+        )}
+      </>
+    )
+  }
+
+  const workshopState = useMemo<DualScreenWorkshopState>(() => {
+    if (equipmentTab === 'crafting') {
+      if (!selectedRecipe) {
+        return {
+          mode: 'crafting',
+          title: 'Craft Output',
+          subtitle: 'No recipe selected',
+          items: [],
+        }
+      }
+      return {
+        mode: 'crafting',
+        title: selectedRecipe.item.name,
+        subtitle: `${SLOT_LABELS[selectedRecipe.item.slot]} - Item Level ${selectedRecipe.item.itemLevel}`,
+        summary: selectedRecipe.item.description,
+        items: [
+          {
+            glyph: selectedRecipe.item.glyph,
+            title: 'Craft Output',
+            meta: `+${selectedRecipe.item.healingPower} Healing Power / +${selectedRecipe.item.maxResourceBonus} Max Resource`,
+            status: selectedRecipe.canCraft ? 'Ready' : 'Missing components',
+          },
+          ...selectedRecipe.components.map((component) => ({
+            glyph: component.item.glyph,
+            title: component.item.name,
+            meta: `Item Level ${component.item.itemLevel}`,
+            status: `${component.owned}/${component.quantity}`,
+          })),
+        ],
+      }
+    }
+    if (!selectedItem) {
+      return {
+        mode: 'equipment',
+        title: 'Equipment Detail',
+        subtitle: 'No item selected',
+        items: [],
+      }
+    }
+    return {
+      mode: 'equipment',
+      title: selectedItem.slot === 'component' ? 'Crafting Component' : selectedItem.name,
+      subtitle: `${SLOT_LABELS[selectedItem.slot]} - Item Level ${selectedItem.itemLevel}`,
+      summary: selectedItem.description,
+      items: selectedItem.slot === 'component'
+        ? [{
+          glyph: selectedItem.glyph,
+          title: selectedItem.name,
+          meta: `Owned: ${selectedItem.quantity}`,
+          status: 'Component',
+        }]
+        : [
+          {
+            glyph: selectedItem.glyph,
+            title: selectedItem.name,
+            meta: `+${selectedItem.healingPower} Healing Power / +${selectedItem.maxResourceBonus} Max Resource`,
+            status: selectedItem.equipped ? 'Equipped' : 'Inventory',
+          },
+          ...(comparisonItem && comparisonItem.id !== selectedItem.id
+            ? [{
+              glyph: comparisonItem.glyph,
+              title: comparisonItem.name,
+              meta: `+${comparisonItem.healingPower} Healing Power / +${comparisonItem.maxResourceBonus} Max Resource`,
+              status: 'Currently Equipped',
+            }]
+            : [{
+              title: selectedItem.equipped ? 'Already Equipped' : 'Empty Slot',
+              status: 'Comparison',
+            }]),
+          ...(upgradeRecipe
+            ? [
+              {
+                glyph: upgradeRecipe.item.glyph,
+                title: `Upgrade to ${upgradeRecipe.item.name}`,
+                meta: `Item Level ${upgradeRecipe.item.itemLevel}`,
+                status: upgradeRecipe.canCraft ? 'Ready' : 'Missing materials',
+              },
+              ...upgradeRecipe.components.map((component) => ({
+                glyph: component.item.glyph,
+                title: component.item.name,
+                meta: `Required for upgrade`,
+                status: `${component.owned}/${component.quantity}`,
+              })),
+            ]
+            : []),
+        ],
+    }
+  }, [comparisonItem, equipmentTab, selectedItem, selectedRecipe, upgradeRecipe])
+
+  useDualScreenWorkshopPublisher(workshopState, dualScreenEnabled)
+
   const content = (
     <>
       {!embedded && (
@@ -244,22 +432,24 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
         <GearStat value={`+${profile.gearStats.maxResourceBonus}`} label={`Max ${profile.character.resourceName}`} />
       </div>
 
-      <nav className="equipment-tabs">
+      {showModeTabs && (
-        <button
+        <nav className="equipment-tabs">
-          className={`equipment-tab ${equipmentTab === 'equipment' ? 'active' : ''}`}
+          <button
-          onClick={() => setEquipmentTab('equipment')}
+            className={`equipment-tab ${equipmentTab === 'equipment' ? 'active' : ''}`}
-          type="button"
+            onClick={() => setEquipmentTab('equipment')}
-        >
+            type="button"
-          Equipment
+          >
-        </button>
+            Equipment
-        <button
+          </button>
-          className={`equipment-tab ${equipmentTab === 'crafting' ? 'active' : ''}`}
+          <button
-          onClick={() => setEquipmentTab('crafting')}
+            className={`equipment-tab ${equipmentTab === 'crafting' ? 'active' : ''}`}
-          type="button"
+            onClick={() => setEquipmentTab('crafting')}
-        >
+            type="button"
-          Crafting
+          >
-        </button>
+            Crafting
-      </nav>
+          </button>
+        </nav>
+      )}
 
       {equipmentTab === 'equipment' ? (
         <>
@@ -268,9 +458,6 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
               selectedItem.slot === 'component' ? (
                 <>
                   <ItemDetail title="Crafting Component" item={selectedItem} />
-                  <div className="equip-action">
-                    <p className="component-note">Used in crafting.</p>
-                  </div>
                 </>
               ) : (
                 <>
@@ -284,41 +471,6 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
                       <h2>{selectedItem.equipped ? 'Already Equipped' : 'Empty Slot'}</h2>
                     </div>
                   )}
-                  <div className="equip-action">
-                    <ComparisonDelta selected={selectedItem} equipped={comparisonItem} />
-                    <button
-                      className="primary-button"
-                      disabled={selectedItem.equipped || equipping || breakingDown || upgrading}
-                      onClick={equipSelected}
-                      type="button"
-                    >
-                      {selectedItem.equipped ? 'Equipped' : equipping ? 'Equipping...' : 'Equip Item'}
-                    </button>
-                    {upgradeRecipe && (
-                      <button
-                        className="primary-button"
-                        disabled={!upgradeRecipe.canCraft || equipping || breakingDown || upgrading}
-                        onClick={upgradeSelected}
-                        type="button"
-                      >
-                        {upgrading ? 'Upgrading...' : `Upgrade to iLvl ${upgradeRecipe.item.itemLevel}`}
-                      </button>
-                    )}
-                    {(!selectedItem.equipped || selectedItem.quantity > 1) && (
-                      <button
-                        className="breakdown-button"
-                        disabled={equipping || breakingDown || upgrading}
-                        onClick={breakdownSelected}
-                        type="button"
-                      >
-                        {breakingDown
-                          ? 'Breaking Down...'
-                          : selectedItem.quantity > 1
-                            ? 'Break Down Duplicate'
-                            : 'Break Down'}
-                      </button>
-                    )}
-                  </div>
                 </>
               )
             ) : (
@@ -326,6 +478,10 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
             )}
           </section>
 
+          <section className="equipment-action-strip">
+            {renderEquipmentActions()}
+          </section>
+
           <div className="equipment-layout">
             <section className="equipped-panel">
               <EquipmentHeading eyebrow="Currently Worn" title="Equipment Slots" />
@@ -421,43 +577,82 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
         <section className="crafting-panel">
           <EquipmentHeading
             eyebrow="Crafting"
-            title="Recipes"
+            title="Workbench"
-            detail={`${filteredRecipes.filter((recipe) => recipe.canCraft).length} ready`}
+            detail={`${readyRecipeCount} ready / ${filteredRecipes.length} shown`}
           />
-          <div className="crafting-filter-bar">
+          <div className="crafting-layout">
-            <select
+            <aside className="crafting-filters">
-              className="filter-select"
+              <div>
-              value={slotFilter}
+                <p className="eyebrow">Slot</p>
-              onChange={(e) => {
+                <div className="crafting-filter-grid">
-                setSlotFilter(e.target.value as EquipmentSlot | 'all')
+                  <button
-                setRecipePage(0)
+                    className={slotFilter === 'all' ? 'active' : ''}
-              }}
+                    onClick={() => {
-            >
+                      setSlotFilter('all')
-              <option value="all">All Slots</option>
+                      setRecipePage(0)
-              {(Object.entries(SLOT_LABELS) as [EquipmentSlot, string][]).map(([slot, label]) => (
+                    }}
-                <option key={slot} value={slot}>{label}</option>
+                    type="button"
-              ))}
+                  >
-            </select>
+                    <strong>All</strong>
-            <select
+                    <span>{profile.craftingRecipes.filter((recipe) => DIRECT_CRAFT_ITEM_LEVELS.has(recipe.item.itemLevel)).length}</span>
-              className="filter-select"
+                  </button>
-              value={levelFilter ?? ''}
+                  {CRAFTING_FILTER_SLOTS.map((slot) => (
-              onChange={(e) => {
+                    <button
-                setLevelFilter(e.target.value === '' ? null : Number(e.target.value))
+                      className={slotFilter === slot ? 'active' : ''}
-                setRecipePage(0)
+                      disabled={(slotRecipeCounts.get(slot) ?? 0) === 0}
-              }}
+                      key={slot}
-            >
+                      onClick={() => {
-              <option value="">All Levels</option>
+                        setSlotFilter(slot)
-              {availableLevels.map((level) => (
+                        setRecipePage(0)
-                <option key={level} value={level}>Item Level {level}</option>
+                      }}
-              ))}
+                      type="button"
-            </select>
+                    >
-          </div>
+                      <strong>{SLOT_LABELS[slot]}</strong>
-          {filteredRecipes.length === 0 && (
+                      <span>{slotRecipeCounts.get(slot) ?? 0}</span>
-            <p className="inventory-empty">No crafting recipes match filters.</p>
+                    </button>
-          )}
+                  ))}
-          {filteredRecipes.length > 0 && (
+                </div>
-            <div className="crafting-layout">
+              </div>
-              <div className="crafting-list">
+              <div>
+                <p className="eyebrow">Item Level</p>
+                <div className="crafting-level-row">
+                  <button
+                    className={levelFilter === null ? 'active' : ''}
+                    onClick={() => {
+                      setLevelFilter(null)
+                      setRecipePage(0)
+                    }}
+                    type="button"
+                  >
+                    All
+                  </button>
+                  {availableLevels.map((level) => (
+                    <button
+                      className={levelFilter === level ? 'active' : ''}
+                      key={level}
+                      onClick={() => {
+                        setLevelFilter(level)
+                        setRecipePage(0)
+                      }}
+                      type="button"
+                    >
+                      {level}
+                    </button>
+                  ))}
+                </div>
+              </div>
+            </aside>
+
+            <section className="crafting-list-panel">
+              <EquipmentHeading
+                eyebrow="Recipes"
+                title={slotFilter === 'all' ? 'Available' : SLOT_LABELS[slotFilter]}
+                detail={`Page ${recipePage + 1}/${recipePageCount}`}
+              />
+              {filteredRecipes.length === 0 ? (
+                <p className="inventory-empty">No recipes match filters.</p>
+              ) : (
+                <div className="crafting-list">
                 {recipePageItems.map((recipe) => (
                   <button
                     className={`${selectedRecipeId === recipe.id ? 'selected' : ''} rarity-${recipe.item.rarity}`}
@@ -473,9 +668,13 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
                         {recipe.item.setName ? ` - ${recipe.item.setName}` : ''}
                       </small>
                     </div>
-                    <i>{recipe.canCraft ? 'Ready' : 'Needs materials'}</i>
+                    <i className={recipe.canCraft ? 'ready' : 'missing'}>
+                      {recipe.canCraft ? 'Ready' : 'Needs materials'}
+                    </i>
                   </button>
                 ))}
+                </div>
+              )}
                 {filteredRecipes.length > CRAFTING_LIST_PAGE_SIZE && (
                   <ListPager
                     label={`Page ${recipePage + 1} / ${recipePageCount}`}
@@ -485,10 +684,26 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
                     previousDisabled={recipePage <= 0}
                   />
                 )}
+              <div className="crafting-action-row">
+                <button
+                  className="primary-button"
+                  disabled={selectedRecipeRequiresUpgrade || !selectedRecipe?.canCraft || crafting}
+                  onClick={craftSelected}
+                  type="button"
+                >
+                  {crafting ? 'Crafting...' : selectedRecipeRequiresUpgrade ? 'Upgrade Existing Item' : 'Craft Item'}
+                </button>
               </div>
-              {selectedRecipe && (
+            </section>
+
+            <section className="crafting-detail-panel">
+              {selectedRecipe ? (
                 <div className={`crafting-detail rarity-${selectedRecipe.item.rarity}`}>
                   <ItemDetail title="Craft Output" item={{ ...selectedRecipe.item, quantity: 1, equipped: false }} />
+                  <div className="crafting-detail-heading">
+                    <p className="eyebrow">Materials</p>
+                    <span>{selectedRecipe.canCraft ? 'Ready' : 'Missing components'}</span>
+                  </div>
                   <div className="crafting-components">
                     {selectedRecipe.components.map((component) => (
                       <div
@@ -501,22 +716,16 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
                       </div>
                     ))}
                   </div>
-                  <button
-                    className="primary-button"
-                    disabled={!selectedRecipe.canCraft || crafting}
-                    onClick={craftSelected}
-                    type="button"
-                  >
-                    {crafting ? 'Crafting...' : 'Craft Item'}
-                  </button>
                 </div>
+              ) : (
+                <p className="inventory-empty">Select a recipe.</p>
               )}
-            </div>
+            </section>
-          )}
+          </div>
         </section>
       )}
 
-      {profile.setBonuses.length > 0 && (
+      {equipmentTab === 'equipment' && profile.setBonuses.length > 0 && (
         <section className="set-bonus-panel">
           <div className="equipment-heading toggle-heading">
             <div>
@@ -552,11 +761,11 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
   )
 
   if (embedded) {
-    return <div className="equipment-screen embedded-screen">{content}</div>
+    return <div className={`equipment-screen embedded-screen ${equipmentTab === 'crafting' ? 'crafting-active' : ''}`}>{content}</div>
   }
 
   return (
-    <section className="content-screen equipment-screen">
+    <section className={`content-screen equipment-screen ${equipmentTab === 'crafting' ? 'crafting-active' : ''}`}>
       {content}
     </section>
   )

src/components/PvpRoguelikeScreen.tsx

@@ -1,5 +1,15 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { INITIAL_PARTY, RAID_PARTY, type CombatLogEntry, type PartyMember, type Spell } from '../game'
+import {
+  INITIAL_PARTY,
+  RAID_PARTY,
+  DEFAULT_GROUP_HEAL_TARGETS,
+  groupHealTargets,
+  partyDamageOutput,
+  tankPressureTargets,
+  type CombatLogEntry,
+  type PartyMember,
+  type Spell,
+} from '../game'
 import { completeRoguelike, type DungeonReward } from '../profile'
 import type { Ability, CharacterProfile, DungeonEncounter } from '../profile'
 import type { GameMode } from '../gameRepository'
@@ -34,7 +44,7 @@ type PvpEncounter = DungeonEncounter & {
   sourceEncounterId?: number
 }
 
-type SlotKey = '1' | '2' | '3' | '4' | '5'
+type SlotKey = '1' | '2' | '3' | '4' | '5' | '6'
 type AbilityLabelMode = 'ability' | 'slot'
 
 type SelfBuffId =
@@ -78,6 +88,17 @@ type FloatingCombatText = {
   value: number
 }
 
+type PvpRunSummary = {
+  bossesKilled: number
+  experienceGained: number
+  previousLevel: number | null
+  newLevel: number | null
+  levelsGained: number
+  talentPointsGained: number
+  unlockedAbilities: DungeonReward['unlockedAbilities']
+  loot: Array<NonNullable<DungeonReward['bonusItem']>>
+}
+
 const BOSS_MECHANICS: BossMechanic[] = [
   'party-pulse',
   'searing-mark',
@@ -119,6 +140,19 @@ function formatEffectTime(ticks: number) {
   return Number.isInteger(seconds) ? `${seconds}s` : `${seconds.toFixed(1)}s`
 }
 
+function createEmptyPvpRunSummary(): PvpRunSummary {
+  return {
+    bossesKilled: 0,
+    experienceGained: 0,
+    previousLevel: null,
+    newLevel: null,
+    levelsGained: 0,
+    talentPointsGained: 0,
+    unlockedAbilities: [],
+    loot: [],
+  }
+}
+
 function buffStacks<T extends string>(items: T[], id: T) {
   return items.filter((item) => item === id).length
 }
@@ -130,7 +164,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'] as SlotKey[]).flatMap((slot) => {
+  const slotChoices = (['1', '2', '3', '4', '5', '6'] as SlotKey[]).flatMap((slot) => {
     const label = slotLabel(slot, spells, labelMode)
     return [
       {
@@ -159,7 +193,7 @@ function buildSelfBuffChoices(spells: Spell[], labelMode: AbilityLabelMode): Arr
 }
 
 function buildOpponentDebuffChoices(spells: Spell[], labelMode: AbilityLabelMode): Array<Choice<OpponentDebuffId>> {
-  const slotChoices = (['1', '2', '3', '4', '5'] as SlotKey[]).flatMap((slot) => {
+  const slotChoices = (['1', '2', '3', '4', '5', '6'] as SlotKey[]).flatMap((slot) => {
     const label = slotLabel(slot, spells, labelMode)
     return [
       {
@@ -217,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[]) {
+function healMember(member: PartyMember, amount: number, debuffs: OpponentDebuffId[], multiplier = 1) {
-  return clamp(member.health + healAmount(member, amount, debuffs), 0, effectiveMaxHealth(member))
+  return clamp(member.health + healAmount(member, amount, debuffs, multiplier), 0, effectiveMaxHealth(member))
 }
 
 function cooldownMultiplier(spell: Spell, buffs: SelfBuffId[], debuffs: OpponentDebuffId[]) {
@@ -300,7 +334,7 @@ function scoreSelfBuff(buff: Choice<SelfBuffId>, spells: Spell[]) {
   if (buff.id === 'fifth-cast-free') return 8
   if (buff.id === 'group-heal-boost') return 8
   if (buff.id === 'shield-boost') return 6
-  const slot = buff.id.match(/slot([1-5])/i)?.[1] as SlotKey | undefined
+  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
   if (buff.id.endsWith('extra-target')) {
@@ -374,7 +408,7 @@ export function PvPRoguelikeScreen({
   const gameClass = profile.classes.find((candidate) => candidate.id === profile.character.classId)!
   const starterSpells = useMemo(() => gameClass.spells
     .filter((spell) => spell.unlockLevel === 1)
-    .slice(0, 5)
+    .slice(0, 6)
     .map((spell, index) => toCombatSpell(spell, String(index + 1))), [gameClass.spells])
   const [abilityLabelMode] = useState<AbilityLabelMode>('ability')
   const selfBuffChoicesCatalog = useMemo(
@@ -411,11 +445,14 @@ export function PvPRoguelikeScreen({
   const [playerSide, setPlayerSide] = useState<SideState>(() => starterSide(partyTemplate, maxResource))
   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('')
   const [log, setLog] = useState<CombatLogEntry[]>([{ id: 1, text: 'Queueing opponent...', tone: 'system' }])
   const [reward, setReward] = useState<DungeonReward | null>(null)
+  const [runSummary, setRunSummary] = useState<PvpRunSummary>(() => createEmptyPvpRunSummary())
   const [rewardError, setRewardError] = useState('')
   const [showEndLog, setShowEndLog] = useState(false)
   const [floatingTexts, setFloatingTexts] = useState<FloatingCombatText[]>([])
@@ -433,6 +470,8 @@ export function PvPRoguelikeScreen({
   const bossRewardClaimedRef = useRef(new Set<number>())
   const cpuDefeatedRef = useRef(false)
   const playerClearedEncounterRef = useRef(-1)
+  const queuedMatchRef = useRef(false)
+  const encounterPoolRef = useRef(encounterPool)
   const playerRef = useRef(playerSide)
   const cpuRef = useRef(cpuSide)
   const encounter = encounters[encounterIndex]
@@ -445,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)
@@ -459,6 +506,12 @@ export function PvPRoguelikeScreen({
   const {
     enabled: dualScreenEnabled,
   } = useDualScreen()
+
+  const setSelectedTargetId = useCallback((id: string) => {
+    selectedIdRef.current = id
+    setSelectedId(id)
+  }, [])
+
   const addLog = useCallback((text: string, tone: CombatLogEntry['tone']) => {
     setLog((current) => [createLogEntry(nextLogId, text, tone), ...current].slice(0, 60))
   }, [])
@@ -473,11 +526,16 @@ export function PvPRoguelikeScreen({
   }, [])
 
   useEffect(() => {
+    if (queuedMatchRef.current) return
     const loadedCheckpoint = loadPvpRoguelikeCheckpoint(profile.character.id, contentType)
     setCheckpointStage(loadedCheckpoint)
     setStartStage(loadedCheckpoint)
   }, [contentType, profile.character.id])
 
+  useEffect(() => {
+    encounterPoolRef.current = encounterPool
+  }, [encounterPool])
+
   const awardBossReward = useCallback((encounterIndexValue: number) => {
     if (bossRewardClaimedRef.current.has(encounterIndexValue)) return
     bossRewardClaimedRef.current.add(encounterIndexValue)
@@ -497,6 +555,20 @@ export function PvPRoguelikeScreen({
     )
       .then((result) => {
         setReward(result)
+        setRunSummary((current) => {
+          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,
+            experienceGained: current.experienceGained + result.experienceGained,
+            previousLevel: current.previousLevel ?? result.previousLevel,
+            newLevel: result.newLevel,
+            levelsGained: current.levelsGained + result.levelsGained,
+            talentPointsGained: current.talentPointsGained + result.talentPointsGained,
+            unlockedAbilities: Array.from(unlockedById.values()),
+            loot: result.bonusItem ? [...current.loot, result.bonusItem] : current.loot,
+          }
+        })
         onProfileUpdated(result.profile)
         if (result.bonusItem) {
           addLog(
@@ -532,8 +604,9 @@ export function PvPRoguelikeScreen({
       : null)
   }, [opponentDebuffChoicesCatalog, selfBuffChoicesCatalog])
 
-  useEffect(() => {
+  const startMatch = useCallback((nextStartStage?: number) => {
-    const firstSegment = buildEncounterSegment(encounterPool, startStage, contentType)
+    const matchStartStage = nextStartStage ?? loadPvpRoguelikeCheckpoint(profile.character.id, contentType)
+    const firstSegment = buildEncounterSegment(encounterPoolRef.current, matchStartStage, contentType)
     const firstEncounter = firstSegment[0]
     const basePlayer = starterSide(partyTemplate, maxResource)
     const baseCpu = starterSide(cpuPartyTemplate, maxResource)
@@ -543,15 +616,18 @@ export function PvPRoguelikeScreen({
     cpuRef.current = baseCpu
     nextLogId.current = 2
     playerClearedEncounterRef.current = -1
+    queuedMatchRef.current = true
     bossRewardClaimedRef.current = new Set()
     setEncounters(firstSegment)
     setEncounterIndex(0)
-    setStage(startStage)
+    setCheckpointStage(matchStartStage)
+    setStartStage(matchStartStage)
+    setStage(matchStartStage)
     setElapsedTicks(0)
     setStatus('queueing')
     setPlayerSide(basePlayer)
     setCpuSide(baseCpu)
-    setSelectedId(partyTemplate[0].id)
+    setSelectedTargetId(partyTemplate[0].id)
     setPlayerBuffChoices([])
     setPlayerDebuffChoices([])
     setSelectedBuff(null)
@@ -560,6 +636,7 @@ export function PvPRoguelikeScreen({
     setPaused(false)
     setTargetGroup(0)
     setReward(null)
+    setRunSummary(createEmptyPvpRunSummary())
     setRewardError('')
     setShowEndLog(false)
     setFloatingTexts([])
@@ -569,26 +646,28 @@ export function PvPRoguelikeScreen({
     cpuDefeatedRef.current = false
     if (gameMode === 'offline') {
       const randomCpu = randomCpuDifficulty()
-      setQueueMessage(`Offline mode. CPU ${randomCpu} enters at stage ${startStage}.`)
+      setQueueMessage(`Offline mode. CPU ${randomCpu} enters at stage ${matchStartStage}.`)
       setCpuDifficulty(randomCpu)
-      setLog([{ id: 1, text: `Offline mode. CPU ${randomCpu} enters at stage ${startStage}.`, tone: 'system' }])
+      setLog([{ id: 1, text: `Offline mode. CPU ${randomCpu} enters at stage ${matchStartStage}.`, tone: 'system' }])
       const timer = window.setTimeout(() => {
         setStatus('playing')
-        addLog(`Stage ${startStage} begins against CPU ${randomCpu}.`, 'system')
+        addLog(`Stage ${matchStartStage} begins against CPU ${randomCpu}.`, 'system')
       }, 500)
       return () => window.clearTimeout(timer)
     }
-    setQueueMessage(`Searching queue. Stage ${startStage} start ready.`)
+    setQueueMessage(`Searching queue. Stage ${matchStartStage} start ready.`)
-    setLog([{ id: 1, text: `Searching queue. Stage ${startStage} start ready.`, tone: 'system' }])
+    setLog([{ id: 1, text: `Searching queue. Stage ${matchStartStage} start ready.`, tone: 'system' }])
     const timer = window.setTimeout(() => {
       const randomCpu = randomCpuDifficulty()
       setCpuDifficulty(randomCpu)
       setQueueMessage(`No queued player found. CPU ${randomCpu} steps in.`)
       setStatus('playing')
-      addLog(`No queued player found. CPU ${randomCpu} steps in at stage ${startStage}.`, 'system')
+      addLog(`No queued player found. CPU ${randomCpu} steps in at stage ${matchStartStage}.`, 'system')
     }, 1400)
     return () => window.clearTimeout(timer)
-  }, [addLog, contentType, cpuPartyTemplate, encounterPool, gameMode, maxResource, partyTemplate, startStage])
+  }, [addLog, contentType, cpuPartyTemplate, gameMode, maxResource, partyTemplate, profile.character.id, setSelectedTargetId])
+
+  useEffect(() => startMatch(), [startMatch])
 
   const applySpell = useCallback((
     current: SideState,
@@ -607,10 +686,21 @@ 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] : [])
     const extraTargets = buffStacks(buffs, `slot${spell.key as SlotKey}-extra-target` as SelfBuffId)
+    const groupTargets = new Set(
+      spell.kind === 'group'
+        ? groupHealTargets(current.party, DEFAULT_GROUP_HEAL_TARGETS + extraTargets).map((member) => member.id)
+        : [],
+    )
     for (let index = 0; index < extraTargets; index += 1) {
       if (spell.kind === 'group') break
       if (spell.kind === 'hot') {
@@ -626,21 +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,
@@ -652,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,
       }
     })
@@ -670,46 +790,51 @@ 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: {
+      cooldowns: nextCooldowns,
-        ...current.cooldowns,
-        [spell.id]: spell.cooldown * cooldownMultiplier(spell, buffs, debuffs),
-      },
       castsTowardFree: nextCastsTowardFree,
       freeCastReady: gainedFreeCast || nextFreeCastReady,
     }
     setCurrent(nextState)
     return true
-  }, [addFloatingHeal])
+  }, [activeSpellEffects, addFloatingHeal, starterSpells])
 
   const castPlayerSpell = useCallback((spell: Spell) => {
     if (status !== 'playing' || playerDone || !playerAlive) return
+    const targetId = selectedIdRef.current
     const succeeded = applySpell(playerRef.current, (value) => {
       const next = typeof value === 'function' ? value(playerRef.current) : value
       playerRef.current = next
       setPlayerSide(next)
-    }, 'player', playerRef.current.buffs, playerRef.current.debuffs, spell, selectedId)
+    }, 'player', playerRef.current.buffs, playerRef.current.debuffs, spell, targetId)
-    if (succeeded) addLog(`${spell.name} cast on ${playerRef.current.party.find((member) => member.id === selectedId)?.name ?? 'target'}.`, 'heal')
+    if (succeeded) addLog(`${spell.name} cast on ${playerRef.current.party.find((member) => member.id === targetId)?.name ?? 'target'}.`, 'heal')
-  }, [addLog, applySpell, playerAlive, playerDone, selectedId, status])
+  }, [addLog, applySpell, playerAlive, playerDone, status])
 
   const selectRelativeTarget = useCallback((direction: -1 | 1) => {
     const living = playerRef.current.party.filter((member) => member.health > 0)
     if (living.length === 0) return
-    const currentIndex = living.findIndex((member) => member.id === selectedId)
+    const currentIndex = living.findIndex((member) => member.id === selectedIdRef.current)
     const nextIndex = currentIndex < 0
       ? 0
       : (currentIndex + direction + living.length) % living.length
-    setSelectedId(living[nextIndex].id)
+    setSelectedTargetId(living[nextIndex].id)
-  }, [selectedId])
+  }, [setSelectedTargetId])
 
   const selectDirectionalTarget = useCallback((action: InputAction) => {
-    const currentIndex = playerRef.current.party.findIndex((member) => member.id === selectedId)
+    const currentIndex = playerRef.current.party.findIndex((member) => member.id === selectedIdRef.current)
     if (currentIndex < 0) {
       const firstLiving = playerRef.current.party.find((member) => member.health > 0)
-      if (firstLiving) setSelectedId(firstLiving.id)
+      if (firstLiving) setSelectedTargetId(firstLiving.id)
       return
     }
     const currentRow = Math.floor(currentIndex / partyColumns)
@@ -736,14 +861,14 @@ export function PvPRoguelikeScreen({
         const bSecondary = horizontal ? 0 : Math.abs(b.column - currentColumn)
         return aPrimary - bPrimary || aSecondary - bSecondary
       })
-    if (candidates[0]) setSelectedId(candidates[0].member.id)
+    if (candidates[0]) setSelectedTargetId(candidates[0].member.id)
-  }, [partyColumns, selectedId])
+  }, [partyColumns, setSelectedTargetId])
 
   const selectDirectTarget = useCallback((slot: number) => {
     const index = slot + (contentType === 'raid' ? targetGroup * 6 : 0)
     const member = playerRef.current.party[index]
-    if (member?.health > 0) setSelectedId(member.id)
+    if (member?.health > 0) setSelectedTargetId(member.id)
-  }, [contentType, targetGroup])
+  }, [contentType, setSelectedTargetId, targetGroup])
 
   const cpuTakeTurn = useCallback(() => {
     if (!cpuDifficulty || status !== 'playing' || cpuDone || !cpuAlive) return
@@ -790,10 +915,15 @@ 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) => {
       if (member.health <= 0) return member
       let damage = member.id === primaryTarget.id ? encounterValue.damage : 0
-      if (member.role === 'Tank') damage += encounterValue.tankDamage
+      if (tankPressureIds.has(member.id)) {
+        damage += Math.round(encounterValue.tankDamage * tankPressure.multiplier)
+      }
       if (bossPulse) damage += 10
       if (member.debuff) damage += 6
       const nextPoisonStacks = appliesPoison && member.id === primaryTarget.id
@@ -801,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
@@ -842,9 +976,9 @@ export function PvPRoguelikeScreen({
       cooldowns: Object.fromEntries(
         Object.entries(side.cooldowns).map(([id, seconds]) => [id, Math.max(0, seconds - TICK_MS / 1000)]),
       ),
-      enemyHealth: Math.max(0, side.enemyHealth - encounterValue.partyDamage),
+      enemyHealth: Math.max(0, side.enemyHealth - partyDamageOutput(nextParty, encounterValue.partyDamage)),
     }
-  }, [addFloatingHeal, elapsedTicks, maxResource])
+  }, [activeSpellEffects, addFloatingHeal, elapsedTicks, maxResource])
 
   const beginUpgradePhase = useCallback(() => {
     setPlayerBuffChoices(chooseRandom(selfBuffChoicesCatalog, 3))
@@ -895,12 +1029,18 @@ export function PvPRoguelikeScreen({
         addLog(`CPU ${cpuDifficulty ?? 1} fell. Finish the boss for XP.`, 'loot')
       }
       if (nextPlayer.enemyHealth <= 0) {
+        if (encounter.isBoss && cpuDefeatedRef.current) {
+          finishRoguelikeRun()
+          setStatus('won')
+          addLog('CPU defeated. Match complete.', 'loot')
+          return
+        }
         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
@@ -955,10 +1095,17 @@ export function PvPRoguelikeScreen({
     }
 
     const clearedBoss = encounter.isBoss
+    if (clearedBoss && cpuDefeatedRef.current) {
+      finishRoguelikeRun()
+      setStatus('won')
+      addLog('CPU defeated. Match complete.', 'loot')
+      return
+    }
     const nextStage = clearedBoss ? stage + 1 : stage
     const nextSegment = clearedBoss ? buildEncounterSegment(encounterPool, nextStage, contentType) : []
     const nextEncounter = clearedBoss ? nextSegment[0] : encounters[encounterIndex + 1]
     if (!nextEncounter) {
+      finishRoguelikeRun()
       setStatus('won')
       addLog('No further encounters remain.', 'loot')
       return
@@ -1007,9 +1154,13 @@ export function PvPRoguelikeScreen({
     setElapsedTicks(0)
     setStatus('playing')
     addLog(`You chose ${selectedBuff.name} and ${selectedDebuff.name}. CPU ${cpuDifficulty} chose ${cpuBuff.name} and ${cpuDebuff.name}.`, 'system')
-  }, [addLog, contentType, cpuDifficulty, encounter, encounterIndex, encounterPool, encounters, maxResource, opponentDebuffChoicesCatalog, selectedBuff, selectedDebuff, selfBuffChoicesCatalog, stage, starterSpells])
+  }, [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
@@ -1036,9 +1187,9 @@ export function PvPRoguelikeScreen({
       setTargetGroup((current) => {
         const groupCount = Math.max(1, Math.ceil(playerRef.current.party.length / 6))
         const next = ((current + 1) % groupCount) as 0 | 1 | 2
-        const selectedIndex = playerRef.current.party.findIndex((member) => member.id === selectedId)
+        const selectedIndex = playerRef.current.party.findIndex((member) => member.id === selectedIdRef.current)
         const nextMember = playerRef.current.party[(selectedIndex < 0 ? 0 : selectedIndex % 6) + next * 6]
-        if (nextMember?.health > 0) setSelectedId(nextMember.id)
+        if (nextMember?.health > 0) setSelectedTargetId(nextMember.id)
         return next
       })
       return
@@ -1081,6 +1232,7 @@ export function PvPRoguelikeScreen({
     directPartyTargeting,
     paused,
     targetGroup,
+    speedMultiplier,
   }), [
     bindings,
     controllerIconStyle,
@@ -1105,6 +1257,7 @@ export function PvPRoguelikeScreen({
     playerSide.party,
     playerSide.resource,
     selectedId,
+    speedMultiplier,
     stage,
     starterSpells,
     status,
@@ -1128,7 +1281,7 @@ export function PvPRoguelikeScreen({
         {dualScreenEnabled && status !== 'queueing' && (
           <DualScreenTopCombat
             state={dualScreenState}
-            onSelectTarget={setSelectedId}
+            onSelectTarget={setSelectedTargetId}
           />
         )}
 
@@ -1143,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>
@@ -1152,7 +1306,7 @@ export function PvPRoguelikeScreen({
                   <button
                     className={`party-member ${selectedId === member.id ? 'selected' : ''} ${member.health <= 0 ? 'down' : ''}`}
                     key={`player-${member.id}`}
-                    onClick={() => setSelectedId(member.id)}
+                    onClick={() => setSelectedTargetId(member.id)}
                     type="button"
                   >
                     <div className="member-header">
@@ -1351,9 +1505,39 @@ export function PvPRoguelikeScreen({
               <h2>{status === 'won' ? `CPU ${cpuDifficulty} Falls` : `CPU ${cpuDifficulty} Wins`}</h2>
               <p>{finalEncountersCleared} encounters cleared.</p>
               <div className="reward-summary">
-                {!reward && !rewardError && <p>Boss kills grant XP immediately.</p>}
+                <p>{runSummary.bossesKilled} bosses killed.</p>
+                <p>+{runSummary.experienceGained} XP</p>
+                {runSummary.bossesKilled > 0 && !reward && !rewardError && <p>Final boss rewards still recording...</p>}
                 {rewardError && <p className="reward-error">{rewardError}</p>}
-                {reward && (
+                {runSummary.levelsGained > 0 && runSummary.previousLevel !== null && runSummary.newLevel !== null && (
+                  <p className="level-gain">
+                    Level {runSummary.previousLevel} to {runSummary.newLevel}
+                    <small>+{runSummary.talentPointsGained} talent point{runSummary.talentPointsGained === 1 ? '' : 's'}</small>
+                  </p>
+                )}
+                {runSummary.unlockedAbilities.map((ability) => (
+                  <p className="ability-unlock" key={ability.id}>
+                    <span>{ability.glyph}</span>
+                    Ability Unlocked: {ability.name}
+                  </p>
+                ))}
+                <div className="run-loot-rolls">
+                  {runSummary.loot.length > 0 ? runSummary.loot.map((item, index) => (
+                    <div className="dropped" key={`${item.id}-${index}`}>
+                      <strong>Boss {index + 1}</strong>
+                      <span>
+                        {item.glyph} {item.name} x{item.quantity}
+                        {item.duplicate ? ` (owned x${item.quantityAfter})` : ''}
+                      </span>
+                    </div>
+                  )) : (
+                    <div>
+                      <strong>Loot</strong>
+                      <span>No boss loot awarded</span>
+                    </div>
+                  )}
+                </div>
+                {reward && runSummary.bossesKilled === 0 && (
                   <>
                     <p>+{reward.experienceGained} XP</p>
                     {reward.levelsGained > 0 && (
@@ -1392,6 +1576,7 @@ export function PvPRoguelikeScreen({
                   )}
                 </>
               )}
+              <button onClick={() => startMatch()} type="button">Queue Next Match</button>
               <button className="secondary-result-button" onClick={onExit} type="button">Back to Roguelike</button>
             </div>
           </div>

src/components/TalentScreen.tsx

@@ -1,10 +1,11 @@
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import {
   allocateTalent,
   resetTalents,
   type CharacterProfile,
   type Talent,
 } from '../profile'
+import { useDualScreen, useDualScreenWorkshopPublisher, type DualScreenWorkshopState } from '../dualScreen'
 
 type Props = {
   profile: CharacterProfile
@@ -13,199 +14,286 @@ type Props = {
   embedded?: boolean
 }
 
+const EFFECT_SLOT_LEVELS = [5, 10, 15, 20] as const
+const EFFECT_CLASS_ID = 1
+const EFFECTS_PER_PAGE = 8
+const EFFECT_SOURCE_LABELS: Record<string, string> = {
+  mend: 'Mend',
+  radiance: 'Radiance',
+  shield: 'Shield',
+}
+
+function effectSource(effectType: string) {
+  if (effectType.startsWith('mend_')) return 'mend'
+  if (effectType.startsWith('radiance_')) return 'radiance'
+  if (effectType.startsWith('shield_') || effectType.startsWith('shielded_')) return 'shield'
+  return effectType
+}
+
+function effectCapacity(level: number) {
+  return EFFECT_SLOT_LEVELS.filter((slotLevel) => level >= slotLevel).length
+}
+
+function activeEffects(talents: Talent[]) {
+  return talents.filter((talent) => talent.rank > 0)
+}
+
 export function TalentScreen({ profile, onBack, onUpdated, embedded = false }: Props) {
+  const { enabled: dualScreenEnabled } = useDualScreen()
   const [busyTalentId, setBusyTalentId] = useState<number | null>(null)
-  const [talentPage, setTalentPage] = useState(0)
   const [resetting, setResetting] = useState(false)
+  const [selectedTalentId, setSelectedTalentId] = useState<number | null>(null)
+  const [effectPage, setEffectPage] = useState(0)
   const [message, setMessage] = useState('')
   const scrollRef = useRef<number>(0)
   const gameClass = profile.classes.find(
     (candidate) => candidate.id === profile.character.classId,
   )!
-  const classPointsSpent = gameClass.talents.reduce(
+  const isEffectClass = gameClass.id === EFFECT_CLASS_ID
-    (total, talent) => total + talent.rank,
+  const capacity = isEffectClass ? effectCapacity(profile.character.level) : 0
-    0,
+  const selectedEffects = activeEffects(gameClass.talents)
+  const selectedTalent = gameClass.talents.find((talent) => talent.id === selectedTalentId)
+    ?? selectedEffects[0]
+    ?? gameClass.talents[0]
+    ?? null
+  const effectPageCount = Math.max(1, Math.ceil(gameClass.talents.length / EFFECTS_PER_PAGE))
+  const visibleTalents = gameClass.talents.slice(
+    effectPage * EFFECTS_PER_PAGE,
+    effectPage * EFFECTS_PER_PAGE + EFFECTS_PER_PAGE,
   )
-  const tiers = Array.from(
-    new Set(gameClass.talents.map((talent) => talent.tier)),
-  ).sort((a, b) => a - b)
-  const tierPages = Array.from(
-    { length: Math.ceil(tiers.length / 2) },
-    (_, index) => tiers.slice(index * 2, index * 2 + 2),
-  )
-  const visibleTiers = tierPages[talentPage] ?? tierPages[0] ?? []
 
   useEffect(() => {
     window.scrollTo(0, scrollRef.current)
   }, [profile])
 
+  useEffect(() => {
+    if (selectedTalentId && gameClass.talents.some((talent) => talent.id === selectedTalentId)) return
+    setSelectedTalentId(selectedTalent?.id ?? null)
+  }, [gameClass.talents, selectedTalent?.id, selectedTalentId])
+
+  useEffect(() => {
+    setEffectPage((page) => Math.min(page, effectPageCount - 1))
+  }, [effectPageCount])
+
   function saveScroll() {
     scrollRef.current = window.scrollY
   }
 
-  function lowerTierPoints(talent: Talent) {
-    return gameClass.talents
-      .filter((candidate) => candidate.tier < talent.tier)
-      .reduce((total, candidate) => total + candidate.rank, 0)
-  }
-
   function lockReason(talent: Talent) {
-    if (talent.rank >= talent.maxRank) return 'Maximum rank'
+    if (!isEffectClass) return 'Coming soon'
-
+    if (talent.rank > 0) return ''
-    const requiredTierPoints = (talent.tier - 1) * 5
+    const source = effectSource(talent.effectType)
-    if (lowerTierPoints(talent) < requiredTierPoints) {
+    const sourceConflict = selectedEffects.find((effect) => effectSource(effect.effectType) === source)
-      return `Requires ${requiredTierPoints} earlier-tier points`
+    if (sourceConflict) return `${EFFECT_SOURCE_LABELS[source] ?? source} already selected`
+    if (capacity <= 0) return 'Unlocks at level 5'
+    if (selectedEffects.length >= capacity) {
+      return `Active slots full (${capacity}/${capacity})`
     }
-
-    if (talent.prerequisiteTalentId) {
-      const prerequisite = gameClass.talents.find(
-        (candidate) => candidate.id === talent.prerequisiteTalentId,
-      )
-      if ((prerequisite?.rank ?? 0) < talent.prerequisiteRank) {
-        return `Requires ${talent.prerequisiteName} rank ${talent.prerequisiteRank}`
-      }
-    }
-
-    if (profile.character.talentPoints <= 0) return 'No points available'
-
     return ''
   }
 
-  async function purchaseRank(talent: Talent) {
+  async function toggleEffect(talent: Talent) {
     saveScroll()
     setBusyTalentId(talent.id)
     setMessage('')
     try {
       const updated = await allocateTalent(talent.id)
       onUpdated(updated)
-      setMessage(`${talent.name} increased to rank ${talent.rank + 1}.`)
+      setSelectedTalentId(talent.id)
+      setMessage(talent.rank > 0 ? `${talent.name} removed.` : `${talent.name} activated.`)
     } catch (reason) {
-      setMessage(reason instanceof Error ? reason.message : 'Unable to allocate talent.')
+      setMessage(reason instanceof Error ? reason.message : 'Unable to update spell effect.')
     } finally {
       setBusyTalentId(null)
     }
   }
 
-  async function refundTree() {
+  async function clearEffects() {
     saveScroll()
     setResetting(true)
     setMessage('')
     try {
       const updated = await resetTalents()
       onUpdated(updated)
-      setMessage('All points in this talent tree were refunded.')
+      setMessage('Spell effects cleared.')
     } catch (reason) {
-      setMessage(reason instanceof Error ? reason.message : 'Unable to reset talents.')
+      setMessage(reason instanceof Error ? reason.message : 'Unable to clear spell effects.')
     } finally {
       setResetting(false)
     }
   }
 
+  const workshopState = useMemo<DualScreenWorkshopState | null>(() => {
+    if (!isEffectClass) return null
+    return {
+      mode: 'talents',
+      title: 'Spell Effects',
+      subtitle: `${selectedEffects.length}/${capacity} active`,
+      summary: selectedTalent
+        ? `${selectedTalent.name}: ${selectedTalent.description}`
+        : 'Choose effects to modify your spells.',
+      items: gameClass.talents.map((talent) => ({
+        glyph: talent.glyph,
+        title: talent.name,
+        meta: talent.rank > 0 ? 'Active' : lockReason(talent) || 'Available',
+        detail: talent.description,
+        status: talent.rank > 0 ? 'Selected' : '',
+      })),
+    }
+  }, [capacity, gameClass.talents, isEffectClass, selectedEffects.length, selectedTalent])
+
+  useDualScreenWorkshopPublisher(workshopState, dualScreenEnabled)
+
   const content = (
     <>
       {!embedded && (
         <div className="screen-heading">
           <div>
             <p className="eyebrow">Character Growth</p>
-            <h1>Talents</h1>
+            <h1>Spell Effects</h1>
           </div>
           <button className="back-button" onClick={onBack} type="button">Back</button>
         </div>
       )}
-      <div className="talent-toolbar">
+      <div className="talent-toolbar spell-effect-toolbar">
         <div className="talent-class-summary">
           <span style={{ borderColor: gameClass.themeColor, color: gameClass.themeColor }}>
             {gameClass.name[0]}
           </span>
           <div>
-            <p className="eyebrow">{gameClass.name} Tree</p>
+            <p className="eyebrow">{gameClass.name} Effects</p>
-            <h2>Shape Your Healing Style</h2>
+            <h2>Modify Your Spells</h2>
           </div>
         </div>
         <div className="talent-points">
-          <strong>{profile.character.talentPoints}</strong>
+          <strong>{selectedEffects.length}/{capacity}</strong>
-          <span>Available</span>
+          <span>Active</span>
-          <small>{classPointsSpent} spent in this tree</small>
+          <small>Slots unlock at levels 5, 10, 15, 20</small>
         </div>
       </div>
 
-      <nav className="talent-page-tabs" role="tablist" aria-label="Talent tier pages">
+      {!isEffectClass ? (
-        {tierPages.map((pageTiers, index) => (
+        <div className="talent-empty-state">
-          <button
+          <h2>Spell effects coming soon for {gameClass.name}.</h2>
-            aria-selected={talentPage === index}
+          <p>This replacement system starts with the first class.</p>
-            className={talentPage === index ? 'active' : ''}
+        </div>
-            key={pageTiers.join('-')}
+      ) : (
-            onClick={() => setTalentPage(index)}
+        <div className="spell-effect-layout">
-            role="tab"
+          <section className="effect-slots-panel">
-            type="button"
+            <p className="eyebrow">Active Slots</p>
-          >
+            {EFFECT_SLOT_LEVELS.map((level, index) => {
-            Tiers {pageTiers[0]}-{pageTiers[pageTiers.length - 1]}
+              const effect = selectedEffects[index]
-          </button>
+              const unlocked = profile.character.level >= level
-        ))}
+              return (
-      </nav>
+                <button
+                  className={`effect-slot ${effect ? 'filled' : ''} ${unlocked ? '' : 'locked'}`}
+                  disabled={!effect}
+                  key={level}
+                  onClick={() => effect && setSelectedTalentId(effect.id)}
+                  type="button"
+                >
+                  <span>Lv {level}</span>
+                  <strong>{effect?.name ?? (unlocked ? 'Empty Slot' : 'Locked')}</strong>
+                  <small>{effect?.description ?? (unlocked ? 'Choose an effect from the pool.' : `Reach level ${level}.`)}</small>
+                </button>
+              )
+            })}
+          </section>
 
-      <div className="talent-tree">
+          <section className="effect-pool-panel">
-        {visibleTiers.map((tier) => {
+            <div className="effect-panel-heading">
-          const requiredPoints = (tier - 1) * 5
+              <div>
-          return (
+                <p className="eyebrow">Effect Pool</p>
-            <section className="talent-tier" key={tier}>
+                <h2>Choose and Swap</h2>
-              <div className="tier-label">
-                <span>Tier {tier}</span>
-                <small>
-                  {tier === 1 ? 'Open' : `${requiredPoints} earlier-tier points`}
-                </small>
               </div>
-              <div className="tier-talents">
+              <span>{selectedEffects.length}/{capacity} active</span>
-                {gameClass.talents
+            </div>
-                  .filter((talent) => talent.tier === tier)
+            <div className="selected-effect-strip">
-                  .sort((a, b) => a.branch - b.branch)
+              <div>
-                  .map((talent) => {
+                <p className="eyebrow">Selected Effect</p>
-                    const reason = lockReason(talent)
+                {selectedTalent ? (
-                    const isBusy = busyTalentId === talent.id
+                  <>
-                    return (
+                    <strong>{selectedTalent.name}</strong>
-                      <article
+                    <small>{selectedTalent.description}</small>
-                        className={`talent-node ${reason ? 'locked' : 'available'} ${talent.rank > 0 ? 'invested' : ''}`}
+                  </>
-                        key={talent.id}
+                ) : (
-                        style={{ gridColumn: talent.branch }}
+                  <small>No effect selected.</small>
-                      >
+                )}
-                        <div className="talent-node-header">
-                          <span>{talent.glyph}</span>
-                          <div>
-                            <strong>{talent.name}</strong>
-                            <small>Rank {talent.rank}/{talent.maxRank}</small>
-                          </div>
-                        </div>
-                        <p>{talent.description}</p>
-                        <div className="rank-pips">
-                          {Array.from({ length: talent.maxRank }, (_, index) => (
-                            <i className={index < talent.rank ? 'filled' : ''} key={index} />
-                          ))}
-                        </div>
-                        <button
-                          disabled={Boolean(reason) || isBusy}
-                          onClick={() => purchaseRank(talent)}
-                          type="button"
-                        >
-                          {isBusy ? 'Saving...' : reason || 'Add Rank'}
-                        </button>
-                      </article>
-                    )
-                  })}
               </div>
-            </section>
+              {selectedTalent && (
-          )
+                <button
-        })}
+                  className="primary-button"
-      </div>
+                  disabled={Boolean(lockReason(selectedTalent)) || busyTalentId === selectedTalent.id}
+                  onClick={() => toggleEffect(selectedTalent)}
+                  type="button"
+                >
+                  {busyTalentId === selectedTalent.id
+                    ? 'Saving...'
+                    : selectedTalent.rank > 0
+                      ? 'Remove'
+                      : 'Activate'}
+                </button>
+              )}
+            </div>
+            <div className="effect-pool">
+              {visibleTalents.map((talent) => {
+                const reason = lockReason(talent)
+                const active = talent.rank > 0
+                const selected = selectedTalent?.id === talent.id
+                const isBusy = busyTalentId === talent.id
+                return (
+                  <button
+                    className={`${active ? 'active' : ''} ${selected ? 'selected' : ''}`}
+                    disabled={Boolean(reason) || isBusy}
+                    key={talent.id}
+                    onClick={() => {
+                      setSelectedTalentId(talent.id)
+                      void toggleEffect(talent)
+                    }}
+                    type="button"
+                  >
+                    <span>{talent.glyph}</span>
+                    <div>
+                      <strong>{talent.name}</strong>
+                      <small>{EFFECT_SOURCE_LABELS[effectSource(talent.effectType)] ?? 'Spell'}</small>
+                    </div>
+                    <i>{isBusy ? 'Saving' : active ? 'Active' : reason || 'Available'}</i>
+                  </button>
+                )
+              })}
+            </div>
+            {effectPageCount > 1 && (
+              <div className="effect-pager">
+                <button
+                  disabled={effectPage === 0}
+                  onClick={() => setEffectPage((page) => Math.max(0, page - 1))}
+                  type="button"
+                >
+                  Prev
+                </button>
+                <span>{effectPage + 1}/{effectPageCount}</span>
+                <button
+                  disabled={effectPage >= effectPageCount - 1}
+                  onClick={() => setEffectPage((page) => Math.min(effectPageCount - 1, page + 1))}
+                  type="button"
+                >
+                  Next
+                </button>
+              </div>
+            )}
+          </section>
+        </div>
+      )}
 
       <footer className="talent-footer">
-        <span>{message || 'Talent changes are saved immediately.'}</span>
+        <span>{message || 'Spell effect changes are saved immediately.'}</span>
         <button
           className="text-button"
-          disabled={classPointsSpent === 0 || resetting}
+          disabled={selectedEffects.length === 0 || resetting}
-          onClick={refundTree}
+          onClick={clearEffects}
           type="button"
         >
-          {resetting ? 'Refunding...' : 'Reset Tree'}
+          {resetting ? 'Clearing...' : 'Clear Effects'}
         </button>
       </footer>
     </>

src/dualScreen.tsx

@@ -42,7 +42,7 @@ export type DualScreenCombatState = {
   partySize: number
   selectedId: string
   log: CombatLogEntry[]
-  status: 'playing' | 'won' | 'lost' | 'part-complete' | 'upgrade-choice'
+  status: 'playing' | 'won' | 'lost' | 'part-complete' | 'marathon-choice' | 'upgrade-choice'
   resource: number
   maxResource: number
   resourceName: string
@@ -54,14 +54,31 @@ export type DualScreenCombatState = {
   directPartyTargeting: boolean
   paused: boolean
   targetGroup: 0 | 1 | 2
+  speedMultiplier: 1 | 2
+}
+
+export type DualScreenWorkshopState = {
+  mode: 'class' | 'equipment' | 'crafting' | 'talents'
+  title: string
+  subtitle: string
+  summary?: string
+  items: Array<{
+    glyph?: string
+    title: string
+    meta?: string
+    detail?: string
+    status?: string
+  }>
 }
 
 type DualScreenMessage =
   | { type: 'combat-state'; state: DualScreenCombatState }
+  | { type: 'workshop-state'; state: DualScreenWorkshopState }
   | { type: 'companion-ready' }
   | { type: 'companion-heartbeat' }
   | { type: 'control-action'; action: InputAction }
   | { type: 'combat-ended' }
+  | { type: 'workshop-ended' }
 
 type DualScreenContextValue = {
   enabled: boolean
@@ -102,6 +119,13 @@ function loadRecentSnapshot() {
   }
 }
 
+function memberHotEffects(member: PartyMember) {
+  if (member.hotEffects?.length) return member.hotEffects
+  return member.hotTicks > 0
+    ? [{ id: 'legacy-renew', spellId: 'legacy-renew', label: 'Renew', ticks: member.hotTicks, power: 6 }]
+    : []
+}
+
 export function DualScreenProvider({ children }: { children: ReactNode }) {
   const [enabled, setEnabledState] = useState(
     () => localStorage.getItem(STORAGE_KEY) === 'true',
@@ -280,16 +304,64 @@ export function useDualScreenPublisher(
   }, [enabled, state])
 }
 
+export function useDualScreenWorkshopPublisher(
+  state: DualScreenWorkshopState | null,
+  enabled: boolean,
+) {
+  const stateRef = useRef(state)
+  useEffect(() => {
+    stateRef.current = state
+  }, [state])
+
+  useEffect(() => {
+    if (!enabled || !state) return
+    const channel = createChannel()
+    if (!channel) return
+    const publish = () => {
+      if (stateRef.current) {
+        channel.postMessage({
+          type: 'workshop-state',
+          state: stateRef.current,
+        } satisfies DualScreenMessage)
+      }
+    }
+    channel.onmessage = (event: MessageEvent<DualScreenMessage>) => {
+      if (event.data.type === 'companion-ready') publish()
+    }
+    publish()
+    return () => {
+      channel.postMessage({ type: 'workshop-ended' } satisfies DualScreenMessage)
+      channel.close()
+    }
+  }, [enabled, state])
+
+  useEffect(() => {
+    if (!enabled || !state) return
+    const channel = createChannel()
+    channel?.postMessage({ type: 'workshop-state', state } satisfies DualScreenMessage)
+    channel?.close()
+  }, [enabled, state])
+}
+
 export function DualScreenBottomDisplay() {
   const [state, setState] = useState<DualScreenCombatState | null>(loadRecentSnapshot)
+  const [workshopState, setWorkshopState] = useState<DualScreenWorkshopState | null>(null)
 
   useEffect(() => {
     const channel = createChannel()
     if (!channel) return
     const announce = () => channel.postMessage({ type: 'companion-ready' } satisfies DualScreenMessage)
     channel.onmessage = (event: MessageEvent<DualScreenMessage>) => {
-      if (event.data.type === 'combat-state') setState(event.data.state)
+      if (event.data.type === 'combat-state') {
+        setState(event.data.state)
+        setWorkshopState(null)
+      }
+      if (event.data.type === 'workshop-state') {
+        setWorkshopState(event.data.state)
+        setState(null)
+      }
       if (event.data.type === 'combat-ended') setState(null)
+      if (event.data.type === 'workshop-ended') setWorkshopState(null)
     }
     announce()
     const timer = window.setInterval(() => {
@@ -307,6 +379,40 @@ export function DualScreenBottomDisplay() {
     channel?.close()
   }
 
+  if (!state && workshopState) {
+    return (
+      <main className="dual-bottom-display workshop-bottom-display">
+        <header className="dual-controls-header">
+          <div>
+            <p className="eyebrow">{workshopState.mode}</p>
+            <h1>{workshopState.title}</h1>
+          </div>
+          <div className="dual-controls-progress">
+            <span>{workshopState.subtitle}</span>
+          </div>
+        </header>
+        {workshopState.summary && (
+          <section className="workshop-bottom-summary">
+            {workshopState.summary}
+          </section>
+        )}
+        <section className="workshop-bottom-grid">
+          {workshopState.items.map((item, index) => (
+            <article key={`${item.title}-${index}`}>
+              {item.glyph && <span>{item.glyph}</span>}
+              <div>
+                <strong>{item.title}</strong>
+                {item.meta && <small>{item.meta}</small>}
+                {item.detail && <p>{item.detail}</p>}
+              </div>
+              {item.status && <i>{item.status}</i>}
+            </article>
+          ))}
+        </section>
+      </main>
+    )
+  }
+
   if (!state) {
     return (
       <main className="dual-bottom-display dual-bottom-waiting">
@@ -340,6 +446,7 @@ export function DualScreenBottomDisplay() {
         </div>
         <div className="dual-controls-mana">
           <span>{state.resourceName} {Math.floor(state.resource)} / {state.maxResource}</span>
+          {state.speedMultiplier === 2 && <strong className="speed-badge">2x speed</strong>}
           <div className="bar mana-bar">
             <span style={{ width: `${(state.resource / state.maxResource) * 100}%` }} />
           </div>
@@ -475,6 +582,7 @@ export function DualScreenTopCombat({
             return (
               <button
                 className={`dual-top-member ${state.selectedId === member.id ? 'selected' : ''} ${member.health <= 0 ? 'dead' : ''}`}
+                data-party-member-id={member.id}
                 key={member.id}
                 onClick={() => onSelectTarget(member.id)}
                 type="button"
@@ -500,7 +608,9 @@ export function DualScreenTopCombat({
                   </div>
                 )}
                 <div className="member-effects">
-                  {member.hotTicks > 0 && <span className="buff">Renew</span>}
+                  {memberHotEffects(member).map((effect) => (
+                    <span className="buff" key={effect.id}>{effect.label}</span>
+                  ))}
                   {member.debuff && <span className="debuff">{member.debuff}</span>}
                 </div>
               </button>

src/game.ts

@@ -8,6 +8,20 @@ export type PartyMember = {
   maxHealth: number
   shield: number
   hotTicks: number
+  hotEffects?: Array<{
+    id: string
+    spellId: string
+    label: string
+    ticks: number
+    power: number
+  }>
+  bounceHeals?: Array<{
+    id: string
+    label: string
+    charges: number
+    power: number
+  }>
+  damageReductionTicks?: number
   debuff?: string
   debuffTicks?: number
   poisonStacks?: number
@@ -24,7 +38,8 @@ export type Spell = {
   cooldown: number
   power: number
   glyph: string
-  kind: 'direct' | 'hot' | 'group' | 'shield' | 'cleanse'
+  kind: 'direct' | 'hot' | 'group' | 'shield' | 'cleanse' | 'damage_reduction' | 'bounce_heal'
+  effectType?: string
 }
 
 export type Encounter = {
@@ -44,6 +59,9 @@ export type CombatLogEntry = {
   tone: 'system' | 'heal' | 'danger' | 'loot'
 }
 
+export const TANKLESS_DAMAGE_MULTIPLIER = 1.35
+export const DEFAULT_GROUP_HEAL_TARGETS = 4
+
 export const INITIAL_PARTY: PartyMember[] = [
   { id: 'brann', name: 'Brann', role: 'Tank', health: 150, maxHealth: 150, shield: 0, hotTicks: 0 },
   { id: 'mira', name: 'Mira', role: 'Healer', health: 100, maxHealth: 100, shield: 0, hotTicks: 0 },
@@ -101,7 +119,7 @@ export const SPELLS: Spell[] = [
     id: 'radiance',
     key: '3',
     name: 'Radiance',
-    description: 'Restores health to every living party member.',
+    description: 'Restores health to up to 4 injured party members.',
     cost: 12,
     cooldown: 8,
     power: 18,
@@ -164,3 +182,28 @@ export const ENCOUNTERS: Encounter[] = [
     isBoss: true,
   },
 ]
+
+export function partyDamageOutput(party: PartyMember[], baseDamage: number) {
+  const livingCount = party.filter((member) => member.health > 0).length
+  return Math.round(baseDamage * (livingCount / Math.max(1, party.length)))
+}
+
+export function tankPressureTargets(party: PartyMember[]) {
+  const living = party.filter((member) => member.health > 0)
+  const tanks = living.filter((member) => member.role === 'Tank')
+  if (tanks.length > 0) return { targets: tanks, multiplier: 1 }
+  const damageDealer = living
+    .filter((member) => member.role === 'Damage')
+    .sort((left, right) => right.health - left.health)[0]
+  return {
+    targets: damageDealer ? [damageDealer] : [],
+    multiplier: TANKLESS_DAMAGE_MULTIPLIER,
+  }
+}
+
+export function groupHealTargets(party: PartyMember[], targetCount = DEFAULT_GROUP_HEAL_TARGETS) {
+  return party
+    .filter((member) => member.health > 0)
+    .sort((left, right) => (left.health / left.maxHealth) - (right.health / right.maxHealth))
+    .slice(0, targetCount)
+}

src/gameRepository.ts

@@ -26,6 +26,7 @@ export interface GameRepository {
     completedPart?: number,
     startPart?: number,
     partDurationSeconds?: [number, number, number],
+    hardMode?: boolean,
   ): Promise<DungeonReward>
   completeRoguelike(
     dungeonId: number,
@@ -69,6 +70,7 @@ type OfflineSave = {
   activeClassId: number
   completedDungeonParts: number
   completedRaidPhases: number
+  dungeonCompletions?: Record<string, number>
   characters: Record<number, CharacterData>
   lootRolls: Record<string, LootRoll>
 }
@@ -102,6 +104,7 @@ const offlineSaveKey = 'chronicle.offlineSave.v1'
 const onlineCacheKey = 'chronicle.onlineCache.v1'
 const authTokenKey = 'chronicle.authToken.v1'
 const offlineAccount = { id: -1, username: 'Offline' }
+const ABILITY_SLOT_COUNT = 6
 
 function clone<T>(value: T): T {
   return structuredClone(value)
@@ -146,7 +149,7 @@ function upgradeV1Save(v1: { profile: CharacterProfile; lootRolls: Record<string
       level: cid === p.character.classId ? p.character.level : 1,
       experience: cid === p.character.classId ? p.character.experience : 0,
       talentPoints: cid === p.character.classId ? p.character.talentPoints : 1,
-      abilitySlots: cid === p.character.classId ? [...p.abilitySlots] : [],
+      abilitySlots: cid === p.character.classId ? normalizeAbilitySlots(p.abilitySlots) : [],
       talentRanks,
       inventory: cid === p.character.classId ? clone(p.inventory) : [],
     }
@@ -157,17 +160,41 @@ function upgradeV1Save(v1: { profile: CharacterProfile; lootRolls: Record<string
     activeClassId: p.character.classId,
     completedDungeonParts: p.completedDungeonParts,
     completedRaidPhases: p.completedRaidPhases ?? 0,
+    dungeonCompletions: Object.fromEntries(
+      p.dungeons.map((dungeon) => [String(dungeon.id), dungeon.completionCount ?? 0]),
+    ),
     characters,
     lootRolls: v1.lootRolls ?? {},
   }
 }
 
 function upgradeV2Save(v2: Omit<OfflineSave, 'version' | 'completedRaidPhases'> & { version: 2 }): OfflineSave {
-  return {
+  return normalizeSaveAbilitySlots({
     ...v2,
     version: 3,
     completedRaidPhases: 0,
+  })
+}
+
+function normalizeAbilitySlots(abilitySlots: unknown): Array<number | null> {
+  const slots = Array.isArray(abilitySlots)
+    ? abilitySlots
+      .slice(0, ABILITY_SLOT_COUNT)
+      .map((value) => {
+        if (value === null || value === undefined) return null
+        const id = Number(value)
+        return Number.isInteger(id) ? id : null
+      })
+    : []
+  while (slots.length < ABILITY_SLOT_COUNT) slots.push(null)
+  return slots
+}
+
+function normalizeSaveAbilitySlots(save: OfflineSave): OfflineSave {
+  for (const character of Object.values(save.characters)) {
+    character.abilitySlots = normalizeAbilitySlots(character.abilitySlots)
   }
+  return save
 }
 
 function normalizeOfflineSave(raw: unknown): OfflineSave | null {
@@ -177,12 +204,12 @@ function normalizeOfflineSave(raw: unknown): OfflineSave | null {
     profile?: CharacterProfile
     lootRolls?: Record<string, LootRoll>
   }
-  if (candidate.version === 3) return candidate as OfflineSave
+  if (candidate.version === 3) return normalizeSaveAbilitySlots(candidate as OfflineSave)
   if (candidate.version === 2) {
     return upgradeV2Save(candidate as Omit<OfflineSave, 'version' | 'completedRaidPhases'> & { version: 2 })
   }
   if (candidate.version === 1 && candidate.profile) {
-    return upgradeV1Save(candidate as { profile: CharacterProfile; lootRolls: Record<string, LootRoll> })
+    return normalizeSaveAbilitySlots(upgradeV1Save(candidate as { profile: CharacterProfile; lootRolls: Record<string, LootRoll> }))
   }
   return null
 }
@@ -291,6 +318,10 @@ function buildProfile(save: OfflineSave): CharacterProfile {
   updateCraftingRecipes(static_)
   static_.completedDungeonParts = save.completedDungeonParts
   static_.completedRaidPhases = save.completedRaidPhases
+  static_.dungeons = static_.dungeons.map((dungeon) => ({
+    ...dungeon,
+    completionCount: save.dungeonCompletions?.[String(dungeon.id)] ?? dungeon.completionCount ?? 0,
+  }))
 
   return static_
 }
@@ -359,11 +390,33 @@ function experienceForLevel(level: number) {
   return (level - 1) * (level - 1) * 100
 }
 
+function catchUpExperienceReward(
+  baseReward: number,
+  currentExperience: number,
+  currentLevel: number,
+  targetLevel: number,
+) {
+  if (targetLevel <= currentLevel) return baseReward
+  const targetExperience = experienceForLevel(targetLevel)
+  const gap = Math.max(0, targetExperience - currentExperience)
+  if (gap <= 0) return baseReward
+  const doubledBase = Math.min(baseReward, Math.ceil(gap / 2))
+  return doubledBase * 2 + (baseReward - doubledBase)
+}
+
+function highestOtherClassLevel(save: OfflineSave) {
+  const activeClass = save.activeClassId
+  return Object.entries(save.characters)
+    .filter(([classId]) => Number(classId) !== activeClass)
+    .reduce((highest, [, character]) => Math.max(highest, character.level), 0)
+}
+
 function scaledPvpBossExperience(
   startingExperience: number,
   startingLevel: number,
   bossesCleared: number,
   maxLevel: number,
+  targetLevel = startingLevel,
 ) {
   let experience = startingExperience
   let level = startingLevel
@@ -374,7 +427,8 @@ function scaledPvpBossExperience(
       ? maxExperience
       : experienceForLevel(level + 1)
     const levelBand = Math.max(1, nextLevelExperience - currentLevelFloor)
-    experience = Math.min(maxExperience, experience + Math.round(levelBand * 0.25))
+    const rewardRate = targetLevel > level ? 0.5 : 0.25
+    experience = Math.min(maxExperience, experience + Math.round(levelBand * rewardRate))
     while (level < maxLevel && experienceForLevel(level + 1) <= experience) {
       level += 1
     }
@@ -382,15 +436,25 @@ function scaledPvpBossExperience(
   return { experience, level }
 }
 
+function talentEffectCapacity(level: number) {
+  return Math.min(4, Math.max(0, Math.floor(level / 5)))
+}
+
+function talentEffectSource(effectType: string) {
+  if (effectType.startsWith('mend_')) return 'Mend'
+  if (effectType.startsWith('radiance_')) return 'Radiance'
+  if (effectType.startsWith('shield_') || effectType.startsWith('shielded_')) return 'Shield'
+  return effectType
+}
+
 type ComponentTemplate = { id: number; slug: string; name: string; itemLevel: number; glyph: string; description: string }
 const COMPONENT_ITEMS: Record<number, ComponentTemplate> = {
   1: { id: 600, slug: 'minor-component', name: 'Minor Component', itemLevel: 1, glyph: '◆', description: 'A basic crafting component.' },
-  5: { id: 601, slug: 'basic-component', name: 'Basic Component', itemLevel: 5, glyph: '◇', description: 'A standard crafting component.' },
   10: { id: 602, slug: 'refined-component', name: 'Refined Component', itemLevel: 10, glyph: '◈', description: 'A refined crafting component.' },
-  15: { id: 603, slug: 'advanced-component', name: 'Advanced Component', itemLevel: 15, glyph: '◉', description: 'An advanced crafting component.' },
   20: { id: 604, slug: 'superior-component', name: 'Superior Component', itemLevel: 20, glyph: '◎', description: 'A superior crafting component.' },
   25: { id: 605, slug: 'primal-component', name: 'Primal Component', itemLevel: 25, glyph: '✦', description: 'A primal crafting component.' },
 }
+const DIRECT_CRAFT_ITEM_LEVELS = new Set([1, 10, 20, 25])
 
 type WindowWithApiBase = Window & {
   CAPACITOR_API_BASE_URL?: string
@@ -425,7 +489,7 @@ function mergeProfileIntoSave(profile: CharacterProfile, existingSave?: OfflineS
     level: profile.character.level,
     experience: profile.character.experience,
     talentPoints: profile.character.talentPoints,
-    abilitySlots: [...profile.abilitySlots],
+    abilitySlots: normalizeAbilitySlots(profile.abilitySlots),
     talentRanks,
     inventory: clone(profile.inventory),
   }
@@ -435,6 +499,9 @@ function mergeProfileIntoSave(profile: CharacterProfile, existingSave?: OfflineS
     activeClassId: profile.character.classId,
     completedDungeonParts: profile.completedDungeonParts,
     completedRaidPhases: profile.completedRaidPhases,
+    dungeonCompletions: Object.fromEntries(
+      profile.dungeons.map((dungeon) => [String(dungeon.id), dungeon.completionCount ?? 0]),
+    ),
     characters,
     lootRolls: clone(existingSave?.lootRolls ?? {}),
   }
@@ -718,7 +785,7 @@ const serverRepository: GameRepository = {
       ),
   saveProfile: (classId, abilitySlots) =>
     cachedOnlineLocalRepository.saveProfile(classId, abilitySlots),
-  completeDungeon: (dungeonId, difficultyId, resourceSpent, durationSeconds, completedPart, startPart, partDurationSeconds) =>
+  completeDungeon: (dungeonId, difficultyId, resourceSpent, durationSeconds, completedPart, startPart, partDurationSeconds, hardMode) =>
     cachedOnlineLocalRepository.completeDungeon(
       dungeonId,
       difficultyId,
@@ -727,6 +794,7 @@ const serverRepository: GameRepository = {
       completedPart,
       startPart,
       partDurationSeconds,
+      hardMode,
     ),
   completeRoguelike: (dungeonId, difficultyId, encountersCleared, resourceSpent, durationSeconds, options) =>
     cachedOnlineLocalRepository.completeRoguelike(
@@ -760,13 +828,12 @@ function emptyCharacterData(classId: number): CharacterData {
   const gc = static_.classes.find((c) => c.id === classId)!
   const talentRanks: Record<string, number> = {}
   for (const t of gc.talents) talentRanks[String(t.id)] = 0
-  const starterItemIds = [100, 101, 102, 103, 104, 105, 106, 107, 108, 109]
+  const inventory: Item[] = []
-  const inventory: Item[] = static_.inventory.filter((i) => starterItemIds.includes(i.id)).map((i) => ({ ...i }))
   const startingAbilitySlots: Array<number | null> = gc.spells
     .filter((s) => s.unlockLevel === 1)
-    .slice(0, 5)
+    .slice(0, ABILITY_SLOT_COUNT)
     .map((s) => s.id)
-  while (startingAbilitySlots.length < 6) startingAbilitySlots.push(null)
+  while (startingAbilitySlots.length < ABILITY_SLOT_COUNT) startingAbilitySlots.push(null)
   return {
     level: 1,
     experience: 0,
@@ -806,35 +873,34 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     },
     async saveProfile(classId, abilitySlots) {
       const save = requireStoredSave(store)
-    const static_ = clone(starterProfile) as CharacterProfile
+      const static_ = clone(starterProfile) as CharacterProfile
-    const gameClass = static_.classes.find((candidate) => candidate.id === classId)
+      const gameClass = static_.classes.find((candidate) => candidate.id === classId)
-    if (!gameClass) throw new Error('Selected class does not exist.')
+      if (!gameClass) throw new Error('Selected class does not exist.')
 
-    const slots = abilitySlots.slice(0, 6)
+      const slots = normalizeAbilitySlots(abilitySlots)
-    while (slots.length < 6) slots.push(null)
+      const selectedIds = slots.filter((id): id is number => id !== null)
-    const selectedIds = slots.filter((id): id is number => id !== null)
+      if (new Set(selectedIds).size !== selectedIds.length) {
-    if (new Set(selectedIds).size !== selectedIds.length) {
+        throw new Error('The same ability cannot be equipped twice.')
-      throw new Error('The same ability cannot be equipped twice.')
+      }
-    }
+      const activeChar = save.characters[save.activeClassId]
-    const activeChar = save.characters[save.activeClassId]
+      const validIds = new Set(
-    const validIds = new Set(
+        gameClass.spells
-      gameClass.spells
+          .filter((spell) => spell.unlockLevel <= activeChar.level)
-        .filter((spell) => spell.unlockLevel <= activeChar.level)
+          .map((spell) => spell.id),
-        .map((spell) => spell.id),
+      )
-    )
+      if (selectedIds.some((id) => !validIds.has(id))) {
-    if (selectedIds.some((id) => !validIds.has(id))) {
+        throw new Error('One or more abilities are locked or belong to another class.')
-      throw new Error('One or more abilities are locked or belong to another class.')
+      }
-    }
 
-    if (!save.characters[classId]) {
+      if (!save.characters[classId]) {
-      save.characters[classId] = emptyCharacterData(classId)
+        save.characters[classId] = emptyCharacterData(classId)
-    }
+      }
-    save.characters[classId].abilitySlots = slots
+      save.characters[classId].abilitySlots = slots
-    save.activeClassId = classId
+      save.activeClassId = classId
       store.writeSave(save)
       return buildProfile(save)
     },
-    async completeDungeon(dungeonId, difficultyId, resourceSpent, durationSeconds, completedPart, startPart, partDurationSeconds) {
+    async completeDungeon(dungeonId, difficultyId, resourceSpent, durationSeconds, completedPart, startPart, partDurationSeconds, hardMode) {
     void startPart
     void partDurationSeconds
     if (!Number.isInteger(resourceSpent) || resourceSpent < 0) {
@@ -860,8 +926,15 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     const previousLevel = cd.level
     const previousExperience = cd.experience
     const partCount = completedPart ?? 1
-    const experienceReward = Math.round(
+    const rewardMultiplier = hardMode ? 2 : 1
-      dungeon.experienceReward * difficulty.experienceMultiplier * partCount,
+    const baseExperienceReward = Math.round(
+      dungeon.experienceReward * difficulty.experienceMultiplier * partCount * rewardMultiplier,
+    )
+    const experienceReward = catchUpExperienceReward(
+      baseExperienceReward,
+      previousExperience,
+      previousLevel,
+      highestOtherClassLevel(save),
     )
     const maxExperience = experienceForLevel(profile.maxLevel)
     const newExperience = Math.min(previousExperience + experienceReward, maxExperience)
@@ -896,6 +969,10 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     } else {
       save.completedDungeonParts = Math.max(save.completedDungeonParts, partCount)
     }
+    save.dungeonCompletions = {
+      ...(save.dungeonCompletions ?? {}),
+      [String(dungeonId)]: (save.dungeonCompletions?.[String(dungeonId)] ?? 0) + 1,
+    }
 
     let bonusItem: DungeonReward['bonusItem'] = null
     if ((startPart ?? 1) === 1 && partCount >= 3 && dungeon.completionLoot.length > 0) {
@@ -909,19 +986,20 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
         const selected = rewardPool[Math.floor(Math.random() * rewardPool.length)]
         const existing = profile.inventory.find((item) => item.id === selected.id)
         const duplicate = Boolean(existing)
-        let quantityAfter = 1
+        const rewardQuantity = rewardMultiplier
+        let quantityAfter = rewardQuantity
         if (existing) {
-          existing.quantity += 1
+          existing.quantity += rewardQuantity
           quantityAfter = existing.quantity
         } else {
           profile.inventory.push({
             ...selected,
-            quantity: 1,
+            quantity: rewardQuantity,
             equipped: false,
           })
         }
         cd.inventory = profile.inventory
-        bonusItem = { ...selected, quantity: 1, duplicate, quantityAfter }
+        bonusItem = { ...selected, quantity: rewardQuantity, duplicate, quantityAfter }
       }
     }
 
@@ -974,13 +1052,19 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     const maxExperience = experienceForLevel(profile.maxLevel)
     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)
+      ? scaledPvpBossExperience(previousExperience, previousLevel, bossesCleared, profile.maxLevel, highestOtherClassLevel(save))
       : null
+    const baseRoguelikeReward = Math.round(dungeon.experienceReward * difficulty.experienceMultiplier * (encountersCleared / 3))
     const newExperience = scaledReward
       ? scaledReward.experience
       : Math.min(
         previousExperience
-        + Math.round(dungeon.experienceReward * difficulty.experienceMultiplier * (encountersCleared / 3)),
+        + catchUpExperienceReward(
+          baseRoguelikeReward,
+          previousExperience,
+          previousLevel,
+          highestOtherClassLevel(save),
+        ),
         maxExperience,
       )
     let newLevel = scaledReward?.level ?? previousLevel
@@ -1044,6 +1128,34 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     )!
     const talent = gameClass.talents.find((candidate) => candidate.id === talentId)
     if (!talent) throw new Error('That talent does not belong to the active class.')
+    if (save.activeClassId === 1) {
+      if ((cd.talentRanks[String(talentId)] ?? 0) > 0) {
+        cd.talentRanks[String(talentId)] = 0
+      } else {
+        const capacity = talentEffectCapacity(cd.level)
+        if (capacity <= 0) throw new Error('Spell effects unlock at level 5.')
+        const source = talentEffectSource(talent.effectType)
+        const sourceConflict = gameClass.talents.find(
+          (candidate) =>
+            candidate.id !== talentId
+            && (cd.talentRanks[String(candidate.id)] ?? 0) > 0
+            && talentEffectSource(candidate.effectType) === source,
+        )
+        if (sourceConflict) {
+          throw new Error(`Only one ${source} spell effect can be active.`)
+        }
+        const activeCount = gameClass.talents.reduce(
+          (total, candidate) => total + ((cd.talentRanks[String(candidate.id)] ?? 0) > 0 ? 1 : 0),
+          0,
+        )
+        if (activeCount >= capacity) {
+          throw new Error(`Level ${cd.level} allows ${capacity} active spell effect${capacity === 1 ? '' : 's'}.`)
+        }
+        cd.talentRanks[String(talentId)] = 1
+      }
+      store.writeSave(save)
+      return buildProfile(save)
+    }
     if (cd.talentPoints <= 0) {
       throw new Error('No talent points are available.')
     }
@@ -1086,10 +1198,12 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     for (const talent of gameClass.talents) {
       cd.talentRanks[String(talent.id)] = 0
     }
-    cd.talentPoints = Math.min(
+    if (save.activeClassId !== 1) {
-      profile.maxTalentPoints,
+      cd.talentPoints = Math.min(
-      cd.talentPoints + refunded,
+        profile.maxTalentPoints,
-    )
+        cd.talentPoints + refunded,
+      )
+    }
       store.writeSave(save)
       return buildProfile(save)
     },
@@ -1164,6 +1278,8 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     const profile = buildProfile(save)
     const recipe = profile.craftingRecipes.find((candidate) => candidate.id === recipeId)
     if (!recipe) throw new Error('That crafting recipe does not exist.')
+    const requiresUpgrade = !DIRECT_CRAFT_ITEM_LEVELS.has(recipe.item.itemLevel)
+    if (requiresUpgrade) throw new Error('Upgrade the previous item tier instead.')
     const missing = recipe.components.find((component) => component.owned < component.quantity)
     if (missing) {
       throw new Error(`Need ${missing.quantity} ${missing.item.name} to craft this item.`)
@@ -1191,11 +1307,13 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
     if (item.slot === 'component') throw new Error('Components cannot be upgraded.')
     const currentRecipe = profile.craftingRecipes.find((recipe) => recipe.item.id === item.id)
     const targetRecipe = currentRecipe
-      ? profile.craftingRecipes.find((recipe) =>
+      ? profile.craftingRecipes
-        recipe.sourceEncounterId === currentRecipe.sourceEncounterId
+        .filter((recipe) =>
-        && recipe.item.slot === item.slot
+          recipe.sourceEncounterId === currentRecipe.sourceEncounterId
-        && recipe.item.itemLevel === item.itemLevel + 5,
+          && recipe.item.slot === item.slot
-      )
+          && recipe.item.itemLevel > item.itemLevel,
+        )
+        .sort((left, right) => left.item.itemLevel - right.item.itemLevel)[0]
       : null
     if (!targetRecipe) throw new Error('No upgrade is available for this item.')
     const missing = targetRecipe.components.find((component) => component.owned < component.quantity)
@@ -1356,7 +1474,7 @@ const cachedOnlineRepository: GameRepository = {
   },
   loadProfile: () => cachedOnlineLocalRepository.loadProfile(),
   saveProfile: (classId, abilitySlots) => cachedOnlineLocalRepository.saveProfile(classId, abilitySlots),
-  completeDungeon: (dungeonId, difficultyId, resourceSpent, durationSeconds, completedPart, startPart, partDurationSeconds) =>
+  completeDungeon: (dungeonId, difficultyId, resourceSpent, durationSeconds, completedPart, startPart, partDurationSeconds, hardMode) =>
     cachedOnlineLocalRepository.completeDungeon(
       dungeonId,
       difficultyId,
@@ -1365,6 +1483,7 @@ const cachedOnlineRepository: GameRepository = {
       completedPart,
       startPart,
       partDurationSeconds,
+      hardMode,
     ),
   completeRoguelike: (dungeonId, difficultyId, encountersCleared, resourceSpent, durationSeconds, options) =>
     cachedOnlineLocalRepository.completeRoguelike(

src/input.tsx

@@ -35,6 +35,7 @@ export const INPUT_ACTIONS = [
   'targetParty5',
   'targetParty6',
   'toggleTargetGroup',
+  'toggleSpeed',
   'pause',
 ] as const
 
@@ -63,6 +64,7 @@ export const ACTION_LABELS: Record<InputAction, string> = {
   targetParty5: 'Target Party Member 5',
   targetParty6: 'Target Party Member 6',
   toggleTargetGroup: 'Switch Raid Target Group',
+  toggleSpeed: 'Toggle 2x Speed',
   pause: 'Pause Menu',
 }
 
@@ -89,6 +91,7 @@ export const DEFAULT_BINDINGS: Record<InputDevice, InputBindings> = {
     targetParty5: 'F5',
     targetParty6: 'F6',
     toggleTargetGroup: 'Tab',
+    toggleSpeed: 'Backquote',
     pause: 'Escape',
   },
   controller: {
@@ -111,8 +114,9 @@ export const DEFAULT_BINDINGS: Record<InputDevice, InputBindings> = {
     targetParty3: 'Button15',
     targetParty4: 'Button13',
     targetParty5: 'Button4',
-    targetParty6: 'Button11',
+    targetParty6: 'Button10',
     toggleTargetGroup: 'Button6',
+    toggleSpeed: 'Button11',
     pause: 'Button9',
   },
 }
@@ -145,7 +149,8 @@ const InputContext = createContext<InputContextValue | null>(null)
 function loadBindings(): Record<InputDevice, InputBindings> {
   try {
     const saved = JSON.parse(localStorage.getItem(STORAGE_KEY) ?? '{}') as Partial<Record<InputDevice, Partial<InputBindings>>>
-    const controller = { ...DEFAULT_BINDINGS.controller, ...saved.controller }
+    const savedController = saved.controller
+    const controller = { ...DEFAULT_BINDINGS.controller, ...savedController }
     const usesLegacyAbilityDefaults = [
       'Button2',
       'Button3',
@@ -166,6 +171,15 @@ function loadBindings(): Record<InputDevice, InputBindings> {
         ability6: DEFAULT_BINDINGS.controller.ability6,
       })
     }
+    if (savedController?.toggleSpeed === 'Button7') {
+      controller.toggleSpeed = DEFAULT_BINDINGS.controller.toggleSpeed
+    }
+    if (savedController?.ability6 === 'Button10') {
+      controller.ability6 = DEFAULT_BINDINGS.controller.ability6
+    }
+    if (savedController?.targetParty6 === 'Button11') {
+      controller.targetParty6 = DEFAULT_BINDINGS.controller.targetParty6
+    }
     return {
       pc: { ...DEFAULT_BINDINGS.pc, ...saved.pc },
       controller,
@@ -276,14 +290,6 @@ function hasUiOverlay() {
   ).some(isVisible)
 }
 
-function isCombatTargetAction(action: InputAction) {
-  return action.startsWith('navigate')
-    || action.startsWith('targetParty')
-    || action === 'previousTarget'
-    || action === 'nextTarget'
-    || action === 'toggleTargetGroup'
-}
-
 const BUTTON_LABELS: Record<number, string> = {
   0: 'A / Cross',
   1: 'B / Circle',
@@ -397,7 +403,6 @@ export function InputProvider({ children }: { children: ReactNode }) {
   const keyboardInputRef = useRef(keyboardInput)
   const previousTokensRef = useRef(new Set<string>())
   const repeatRef = useRef<Record<string, number>>({})
-  const lastCombatNavigationRef = useRef(0)
 
   useEffect(() => {
     bindingsRef.current = bindings
@@ -444,11 +449,6 @@ export function InputProvider({ children }: { children: ReactNode }) {
   const dispatchAction = useCallback((action: InputAction, device: InputDevice) => {
     const uiOverlay = hasUiOverlay()
     const combatActive = Boolean(document.querySelector('[data-combat-active="true"]'))
-    if (combatActive && !uiOverlay && isCombatTargetAction(action)) {
-      const now = performance.now()
-      if (now - lastCombatNavigationRef.current < 125) return
-      lastCombatNavigationRef.current = now
-    }
 
     setLastDevice(device)
     document.documentElement.dataset.inputDevice = device
@@ -518,9 +518,11 @@ export function InputProvider({ children }: { children: ReactNode }) {
       'targetParty5',
       'targetParty6',
       'toggleTargetGroup',
+      'toggleSpeed',
     ] satisfies InputAction[]
     const combatPriority = [
       'pause',
+      'toggleSpeed',
       'ability1',
       'ability2',
       'ability3',

src/profile.ts

@@ -168,6 +168,7 @@ export type Dungeon = {
   difficulties: Difficulty[]
   encounters: DungeonEncounter[]
   completionLoot: Array<Omit<Item, 'quantity' | 'equipped'>>
+  completionCount?: number
   leaderboard: LeaderboardEntry[]
   leaderboards: {
     part_1: LeaderboardEntry[]
@@ -319,6 +320,7 @@ export async function completeDungeon(
   completedPart?: number,
   startPart?: number,
   partDurationSeconds?: [number, number, number],
+  hardMode?: boolean,
 ): Promise<DungeonReward> {
   return activeGameRepository().completeDungeon(
     dungeonId,
@@ -328,6 +330,7 @@ export async function completeDungeon(
     completedPart,
     startPart,
     partDurationSeconds,
+    hardMode,
   )
 }