Idle reaper: use unified activity oracle, hold streak on autopilot

midnightReset gated shame DMs on LastActionDate + a fallback busy check
for active expedition / combat session. Players running on background
autopilot got shamed at midnight: dnd_zone_cmd.go gates markActedToday
on !compact (to keep autopilot out of streak credit), so LastActionDate
stayed stale; and if the autopilot's expedition completed / extracted /
got force-extracted before midnight, the busy check also missed it
(getActiveExpedition only matches status='active').

Switch the reaper to loadAdvDailyActivity — the same oracle the daily
report uses, which unions adventure_activity_log + dnd_zone_run +
dnd_expedition_log. Three explicit branches:

  - engaged (LastActionDate today/yesterday or legacy counters bumped)
    → streak bumps, LastActionDate restamped
  - activity-without-tap (autopilot beats, expedition log, or live
    active expedition/combat as safety net) → hold: no bump, no shame,
    no decay
  - truly idle → shame DM + streak halve

The old busy branch bumped streak; new behavior holds. Aligns autopilot
days with mid-fight-at-midnight days: both engaged earlier but typed
nothing today, neither pumps the streak.

Tests cover all three branches + the death-window early-return.

.gitignore

@@ -1,7 +1,11 @@
-data/
+data/*
+!data/open5e/
 .env
 .env.*
 !.env.example
 gogobee
 gensolver
 holdem-train
+/open5e-import
+/expedition-sim
+sim_results/

CHANGELOG-2026-04-08.txt

@@ -0,0 +1,162 @@
+GOGOBEE CHANGELOG — 2026-04-08
+================================
+
+6 commits, 76 files changed, ~3,000 lines added
+
+────────────────────────────────────────────────────────────────────────────────
+1. ADVENTURE 2.5 — STEPS 1-2: ACTION ECONOMY & CHAT LEVEL LOOKUP
+────────────────────────────────────────────────────────────────────────────────
+   - Split daily actions into combat (1) and harvest (3) instead of 3 generic.
+     Players can now do 1 combat + 3 harvest per day instead of choosing 3 from
+     either pool.
+   - Added cross-plugin chat level lookup so adventure perks can read XP levels
+     from the main XP plugin.
+   - Updated character sheet to show combat/harvest action counts separately.
+   - Refactored adventure command dispatch for the new action types.
+
+   Files: adventure.go, adventure_character.go, adventure_render.go,
+          adventure_babysit.go, adventure_events.go, adventure_scheduler.go,
+          adventure_twinbee.go, xp.go, db.go, main.go
+
+
+────────────────────────────────────────────────────────────────────────────────
+2. ADVENTURE 2.5 — STEPS 3-6: CHAT LEVEL PERKS
+────────────────────────────────────────────────────────────────────────────────
+   - Chat Level XP Bonus: +5% adventure XP per 10 chat levels, capped at +25%.
+   - Chat Level Rare Drop Bonus: +0.5% rare drop rate per 10 chat levels,
+     capped at +2.5%.
+   - Shop Greeting: Luigi's greeting changes at chat levels 10, 30, and 50.
+   - Death Pardon: Chat level 30+ grants one free death pardon per week.
+     Pardoned players keep their streak and skip the death timer.
+
+   Files: adventure_chat_perks.go (new), adventure.go, adventure_arena.go,
+          adventure_character.go, adventure_masterwork.go, adventure_shop.go,
+          adventure_treasure.go, db.go
+
+
+────────────────────────────────────────────────────────────────────────────────
+3. ADVENTURE 2.5 — STEPS 7-9: ARENA STREAK SYSTEM
+────────────────────────────────────────────────────────────────────────────────
+   - Replaced per-tier arena entry with a continuous streak starting at Tier 1.
+   - Players fight through T1-T5 sequentially. After each tier, a 30-second
+     countdown starts with real-time message edits. Type !bail to cash out,
+     or auto-advance to the next tier.
+   - Per-tier euro multipliers: T1=1.0x, T2=1.5x, T3=2.0x, T4=2.75x, T5=4.0x.
+   - XP multiplier at payout based on tiers cleared: 1.0x/1.2x/1.5x/1.85x/2.5x.
+   - Death forfeits ALL accumulated rewards (euros + XP).
+   - Gladiator's Helm: streak-exclusive Masterwork-tier drop (8% at T4, 18% T5).
+   - Removed old commands: !arena tier N, !arena descend, !arena cashout.
+   - Added !bail command and countdown goroutine with message editing.
+   - Restart recovery: stale active/awaiting runs auto-bail on bot restart.
+
+   Files: adventure_arena.go (major rewrite), adventure_arena_render.go,
+          adventure.go, adventure_arena_test.go, db.go
+
+
+────────────────────────────────────────────────────────────────────────────────
+4. BUG FIXES & POLISH
+────────────────────────────────────────────────────────────────────────────────
+   - Fixed streak grace period calculation in adventure scheduler.
+   - Fixed UNO earnings tracking not crediting properly.
+   - Fixed hospital UX: cleaner admission flow, insurance billing display.
+   - Added wordle/lottery atomicity: ticket purchases and wordle completions
+     now use proper transactions.
+   - Added !adv alias for !adventure.
+   - Hospital insurance billing now shows itemized breakdown.
+   - Fixed character sheet showing wrong holiday action count.
+   - Removed dead holiday prompt code.
+   - Capped babysit counter to prevent unbounded growth.
+
+   Files: adventure_character.go, adventure_hospital.go, adventure_scheduler.go,
+          adventure_babysit.go, adventure_render.go, lottery.go, lottery_db.go,
+          lottery_draw.go, wordle.go, stats.go, urls.go, llm_passive.go
+
+
+────────────────────────────────────────────────────────────────────────────────
+5. FULL CODEBASE AUDIT — 21 FIXES
+────────────────────────────────────────────────────────────────────────────────
+
+  CRITICAL:
+   - Credit()/Debit() now reject non-positive amounts. Previously, a negative
+     amount could mint or drain euros with no validation.
+   - Lottery ticket purchase moved count check inside DB transaction, closing
+     a TOCTOU race where concurrent buys could exceed the 100-ticket cap.
+
+  HIGH:
+   - Arena bail channel ownership reworked. The countdown goroutine and bail
+     handler now use LoadAndDelete to claim exclusive ownership of the channel,
+     preventing double-close panics.
+   - Added safeGo() panic recovery wrapper. Applied to 17 goroutine launch
+     sites across 14 plugin files. A panic in any async handler previously
+     killed the entire daemon.
+   - Entry.ID validated before exec.Command in fetch-esteemed (path traversal).
+   - Silently ignored DB errors in lottery_db.go now logged.
+
+  MEDIUM:
+   - Added database indexes: idx_arena_runs_user(user_id, status) and
+     idx_euro_bal_user(user_id) for high-traffic query paths.
+   - db.Close() function added; called on SIGINT/SIGTERM shutdown.
+   - Miniflux mutex pattern fixed: snapshot pollingDisabled under lock,
+     check after unlock (was Lock/early-return/Unlock without defer).
+   - JSON unmarshal errors in lottery history/tickets now logged instead
+     of silently discarded.
+   - Internal error details no longer leaked to users in forex and esteemed
+     responses (was showing raw %v error strings).
+
+  LOW:
+   - "Failed to load character" error now suggests !adventure.
+   - Empty !buy args shows usage hint instead of "No item matching ''".
+
+  FALSE POSITIVES VERIFIED:
+   - fun.go array access (bounds checks exist at L441, L591).
+   - adventure_twinbee.go filtered[0] (empty check at L90).
+   - wotd.go defs[0] (empty check at L102).
+   - moderation.go timer overwrite (existing.Stop() called at L799).
+   - All rate-limit callers already provide user feedback.
+
+  Files: euro.go, lottery_db.go, adventure_arena.go, plugin.go, db.go,
+         main.go, forex.go, esteemed.go, miniflux.go, adventure.go,
+         fetch-esteemed/main.go, + 14 plugin files (safeGo conversions)
+
+
+────────────────────────────────────────────────────────────────────────────────
+6. TEST COVERAGE — 328 TESTS ACROSS 4 PACKAGES
+────────────────────────────────────────────────────────────────────────────────
+
+  NEW TEST FILES:
+   - internal/util/parser_test.go (30 tests)
+     XPForLevel, LevelFromXP, round-trip for 0-100, ProgressBar edge cases,
+     IsCommand, GetArgs, HasNonASCII, ParseMessage
+
+   - internal/crypto/crypto_test.go (12 tests)
+     Encrypt/Decrypt round-trip, empty plaintext, different nonces,
+     wrong key rejection, HMAC determinism/length, ParseKey validation
+
+   - internal/plugin/helpers_test.go (30 tests)
+     formatNumber, formatNumberInt64, normalizeExpression (natural language,
+     prefix stripping, commas, percent-of), formatCalcResult, countMatches,
+     formatLotteryNumbers, generateLotteryNumbers (count, range, sorted,
+     unique), joinNames, chatLevelXPBonus, chatLevelRareBonus, shopGreeting
+
+   - internal/plugin/audit_fixes_test.go (21 tests)
+     safeGo panic recovery (normal, panic, nil panic), bail channel
+     ownership transfer (both directions), arena status renders for
+     indexed states, lottery edge cases, error message leak checks,
+     UX guidance verification, integer overflow guards, regression guards
+
+   - internal/db/db_test.go (4 tests)
+     Init/Close lifecycle, idempotent Init, schema index verification,
+     schema runs cleanly against fresh SQLite
+
+  EXISTING TESTS (pre-existing, not written today):
+   - adventure_arena_test.go: 55 (51 pre-existing + 4 added)
+   - adventure_shop_test.go: 26
+   - uno_test.go: 20
+   - adventure_test.go: 17
+   - holdem_tips_test.go: 16
+   - adventure_holidays_test.go: 15
+   - wordle_game_test.go: 9
+   - holdem_eval_test.go: 8
+   - blackjack_test.go: 7
+
+  TOTAL: 328 tests, 0 failures, 4 packages covered

NOTICE

@@ -0,0 +1,19 @@
+GogoBee — third-party content attribution
+==========================================
+
+Open5e SRD data
+---------------
+Portions of GogoBee's spell, bestiary, and magic-item data are derived from
+the Open5e dataset, which republishes the Systems Reference Document (SRD) 5.1.
+
+  Source:   https://open5e.com  /  https://api.open5e.com
+  License:  Creative Commons Attribution 4.0 International (CC-BY-4.0)
+            https://creativecommons.org/licenses/by/4.0/
+  SRD 5.1:  © Wizards of the Coast LLC, released under CC-BY-4.0.
+
+The data is vendored into this repository (data/open5e/) and compiled into
+generated Go source (e.g. internal/plugin/dnd_spells_srd_data.go) by the
+cmd/open5e-import tool. GogoBee has no runtime dependency on the Open5e API.
+
+GogoBee's hand-authored balance tuning, classifiers, and game systems built
+on top of this data are not themselves SRD content.

README.md

@@ -30,8 +30,9 @@ Written in Go using [mautrix-go](https://github.com/mautrix/go) for encryption a
 - **E2EE that actually works** - mautrix-go with goolm (pure Go). Crypto state lives in SQLite so device keys survive restarts. Cross-signing bootstraps on first run — the bot self-verifies its own device.
 - **No CGo, no system deps** - builds to a single static binary. Cross-compile to whatever you want.
 - **50 plugins** with dependency injection and ordered registration
-- **Games & economy** - Euro virtual currency, Hangman (collaborative, threaded, tiered scoring, multilingual clue mode via DreamDict, difficulty tier display), Blackjack (1-4 players, auto-play timeout), UNO (solo vs bot or 2–4 player multiplayer via DMs, with optional No Mercy mode), Texas Hold'em (2-9 players, CFR-trained NPC bot, DM-based gameplay with Ollama coaching tips, 1-hour idle auto-close with 45-min warning), Wordle (daily cooperative, DreamDict-powered, 5-20 letter words, guess persistence across restarts, midnight expiry announcements, video game themed bonus words with category hints, dupe prevention across last 500 puzzles, earnings tracked in stats), Adventure (daily idle RPG via DMs — dungeon, mine, forage, fish, shop, or rest with TwinBee NPC distributing level-scaled rewards, mid-day random events, tier shorthand buying, holiday double actions, hospital revival system, Robbie the Friendly Bandit automated inventory cleaner), Arena (5-tier combat gauntlet with 20 unique monsters, risk-reward cashout system, death lockout, leaderboard), Co-op Dungeons (2–7 day party runs with funding tiers, TwinBee-narrated floor events with voting, spectator parimutuel betting, basket/mimic gift system, weighted-roll item distribution including masterworks at T4–T5), all with channel restriction
+- **Games & economy** - Euro virtual currency, Hangman (collaborative, threaded, tiered scoring, multilingual clue mode via DreamDict, difficulty tier display), Blackjack (1-4 players, auto-play timeout), UNO (solo vs bot or 2–4 player multiplayer via DMs, with optional No Mercy mode), Texas Hold'em (2-9 players, CFR-trained NPC bot, DM-based gameplay with Ollama coaching tips, 1-hour idle auto-close with 45-min warning), Wordle (daily cooperative, DreamDict-powered, 5-20 letter words, guess persistence across restarts, midnight expiry announcements, video game themed bonus words with category hints, dupe prevention across last 500 puzzles, earnings tracked in stats), Adventure 2.0 (D&D-layered RPG: 7 races, 5 classes with 3 subclasses each through L15, real spell slots and forward-simulating combat engine, 10 hand-tuned dungeon zones across 5 tiers, multi-day expeditions with supply burn / threat clock / day cycle / multi-region travel / extract-and-resume / per-zone temporal events, harvest nodes per room, TwinBee as a mood-driven DM with ten zone-specific narration pools, all on top of the existing economy/housing/pets/Misty/Arina/blacksmith/hospital/rivals systems), Arena (5-tier combat gauntlet with 20 unique monsters, streak-based payouts, death lockout, leaderboard), Co-op Dungeons (2–7 day party runs with funding tiers, TwinBee-narrated floor events with voting, spectator parimutuel betting, basket/mimic gift system, weighted-roll item distribution including masterworks at T4–T5), all with channel restriction
 - **Moderation system** (optional) - deterministic detection only, no LLM. Word list with leetspeak variation matching, text/image flood, repeated messages, mention flooding, link rate limiting, invite flooding, join/leave cycling. Three-strike ladder (warn → mute → ban). Admin room notifications, DMs over public callouts.
+- **Space inviter** (optional) - detects local homeserver users who aren't in any Matrix Space and DMs the configured admin to ask whether to invite them to a target Space. Replies are `yes` / `no` / `ignore`. Persistent prompt log in SQLite means restarts/upgrades don't re-ping the admin about users they've already answered. Runs on startup sweep + reactive on join events.
 - **Passive tracking** - XP, stats, streaks, achievements, markov corpus, keyword alerts, all running silently
 - **Scheduled posts** via [robfig/cron](https://github.com/robfig/cron) - Palavra do Dia (Portuguese WOTD with en/fr translations and etymology), holidays, game releases, birthdays, anime/movie releases, concert digests, esteemed members
 - **LLM integration** (optional) - Ollama-powered sentiment analysis, roast profiles, room vibes, tarot readings, conversation summaries
@@ -150,6 +151,7 @@ Everything is configured through environment variables or a `.env` file.
 | `FEATURE_ESTEEMED` | Set to anything to enable satirical esteemed member posts |
 | `ESTEEMED_ROOM` | Room ID for esteemed member posts (separate from broadcast rooms) |
 | `FEATURE_MODERATION` | Set to `true` to enable the moderation system (disabled by default) |
+| `FEATURE_SPACE_INVITER` | Set to `true` to enable the space inviter (disabled by default) |
 | `FEATURE_MARKET` | Set to `true` to enable the market overview plugin |
 | `MARKET_BROADCAST_SUMMARY` | Set to `true` to auto-post daily market summary to broadcast rooms |
 | `DISABLE_WOTD_POST` | Set to `true` to suppress daily WOTD auto-post (the `!wotd` command and passive WOTD usage tracking still work) |
@@ -228,6 +230,20 @@ All moderation settings are optional. The system is disabled unless `FEATURE_MOD
 | `SPACE_GROUP_THRESHOLD` | `50` | Percentage of the smaller room's members that must overlap to group rooms together (1–100) |
 | `HOLIDAY_COUNTRIES` | `US` | Comma-separated ISO country codes for Calendarific holiday posts |
 
+### Space Inviter
+
+Disabled unless `FEATURE_SPACE_INVITER=true`. Requires the bot to be joined to **every** Space on the homeserver — if a Space exists that the bot can't see, users in only that Space will be misclassified as Space-less. Uses the Synapse Admin API to enumerate local users.
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `SPACE_INVITER_TARGET` | | Room ID of the Space to invite users into on `yes` reply |
+| `SPACE_INVITER_HOME_DOMAIN` | | Your homeserver domain (e.g. `parodia.dev`) — only users with this suffix are considered |
+| `SPACE_INVITER_SYNAPSE_URL` | | Base URL for Synapse admin API (e.g. `https://parodia.dev`) |
+| `SPACE_INVITER_ADMIN_TOKEN` | | Synapse admin access token |
+| `SPACE_INVITER_ADMIN_USER` | | User ID to DM with prompts (the operator) |
+| `SPACE_INVITER_DELAY` | `2s` | Delay between prompts during the startup sweep |
+| `SPACE_INVITER_COOLDOWN` | `720h` | Minimum gap between re-prompts for the same user (Go duration). Prevents restart/upgrade ping-spam — a `no` reply is honored for this long across restarts. `ignore` is permanent. |
+
 ### Missing Members
 
 | Variable | Default | Description |
@@ -473,44 +489,150 @@ Daily cooperative Wordle — one puzzle per day, the community works together wi
 
 Economy rewards are tracked per player — `!wordle stats` shows total earnings.
 
-### Adventure (DM-based idle RPG)
+### Adventure (DM-based RPG)
 
-A daily DM-driven idle RPG where each player takes one action per day — dungeon, mine, fish, forage, visit the shop, blacksmith, or rest. Outcomes resolve with flavor text and loot is credited to your euro balance. An evening summary posts to the games room. TwinBee is a permanent NPC adventurer who distributes rewards to active players.
+A layered RPG. **Adventure 2.0** grafts a full D&D-style character system on top of the existing adventure economy, then builds two endgame loops on top of that: single-session dungeon zones and multi-day expeditions. The legacy systems — housing/Thom Krooke, pets, Misty/Arina, blacksmith, hospital, rivals, Robbie, arena, co-op dungeons — all keep working unchanged. Players who don't opt into 2.0 keep the legacy adventure shape; players who run `!setup` get the full D&D layer on top.
 
-Characters auto-create on first `!adventure` (or `!adv`) command. All gameplay happens in DMs — reply to the bot's morning prompt with your choice. DM replies are only interpreted as adventure choices for 15 minutes after a menu is sent, so other DM-based games (UNO, Hold'em) won't conflict.
+Characters auto-create on first interaction. Most gameplay happens in DMs — the morning prompt routes to zones/expeditions for the active flow plus in-town services (shop, blacksmith, rest, hospital, Thom Krooke) for the rest.
+
+#### Adventure 2.0 — D&D Layer
+
+`!setup` once. Pick a race + class. Your existing `combat_level` becomes your D&D level, treasures become attunements, equipment slots carry forward 1:1. Every fight, harvest, arena run, and co-op dungeon is then resolved through D&D mechanics — STR/DEX/CON/INT/WIS/CHA, HP, AC, ability checks, saving throws, all the rest.
+
+**Races (7) — at race choice, fixed stat mods + a passive:**
+
+| Race | Mods (S/D/C/I/W/Ch) | Passive |
+|---|---|---|
+| Human | 0/0/0/0/0/0 | Versatile (floating +1 not yet wired) |
+| Elf | 0/+2/-1/+1/+1/0 | Darkvision; immune to sleep effects |
+| Dwarf | +1/-1/+2/0/+1/-1 | Poison resistance; bonus vs. underground |
+| Halfling | 0/+2/0/0/+1/0 | Lucky: once per combat, reroll a nat 1 |
+| Orc | +3/-1/+2/-1/-1/-1 | Rage: once per combat, +50% damage for one turn |
+| Tiefling | 0/+1/0/+1/0/+2 | Fire resistance; bonus on CHA checks |
+| Half-Elf | 0/+1/0/+1/0/+2 | Two bonus skill proficiencies |
+
+**Classes (5):** Fighter (d10 HP, STR/CON), Rogue (d8, DEX/INT), Mage (d6, INT/WIS), Cleric (d8, WIS/CHA), Ranger (d8, DEX/WIS).
+
+**Subclasses** unlock at L3 via `!subclass`. Each class has 3 archetypes with mechanical features at L5/L7/L10/L15:
+
+| Class | Subclasses |
+|---|---|
+| Fighter | Champion, Battle Master, Berserker |
+| Rogue | Thief, Assassin, Arcane Trickster |
+| Mage | Evocation, Abjuration, Necromancy, Arcane Trickster |
+| Cleric | Life, War, Trickery |
+| Ranger | Hunter, Beast Master, Gloom Stalker |
+
+**Spells.** Mages, Clerics, and Rangers cast for real. Spell slots tracked, combat consumes them. Mages have a spellbook cap that grows with level — pick what to learn at level-up via `!learn`.
+
+**Combat engine.** Forward-simulating turn-by-turn — d20 vs AC for every attack, hit/crit/miss/fumble narration with surfaced roll values (`(🎲 14 vs AC 13)`), monster abilities, status effects, class resources, consumables. Outcomes stream over 2–3 second pacing for suspense, with a roll summary appended.
+
+**Dungeon zones (`!zone`)** — 10 hand-tuned zones, 5 tiers, level bands L1–L20:
+
+| Tier | Zones |
+|---|---|
+| T1 | Goblin Warrens, Crypt of Valdris |
+| T2 | Forest of Shadows, Sunken Temple |
+| T3 | Haunted Manor, Underforge |
+| T4 | Underdark Outpost, Feywild Crossing |
+| T5 | Dragon's Lair, Abyss Portal |
+
+Each run is procedurally laid out (entry → exploration → trap → elite → boss with exploration filler). TwinBee narrates as a mood-driven DM (0–100 mood, shifts on crits/deaths/taunts/zone completion). `!zone enter`, `!zone advance` to resolve the current room, `!zone status`, `!zone map` (ASCII layout `E──?──T──★──☠`), `!zone lore`, `!zone taunt` / `!zone compliment` to poke or flatter your DM.
+
+**Multi-day expeditions (`!expedition`)** — the long form:
+
+- **Outfitting:** buy supply packs at start (standard/deluxe), cost scales with zone tier
+- **Real-time day cycle:** 06:00 morning briefing, 21:00 evening recap (configurable)
+- **Supply burn:** rations tick down each day; harsh zones burn faster; running out triggers forced extraction
+- **Threat Clock (0–100):** every action is noticed. Crossing bands shifts monster density, patrol odds, night events: Quiet → Stirring → Alert → Hostile → Siege
+- **Patrol encounters** at Alert+ — fights interrupt traversal
+- **Night phase / wandering monsters** — checked at the recap
+- **Siege Mode (threat 80+):** fortified camp branches, special warnings
+- **Camp:** `!camp rough` (free, no protection) vs `!camp standard` (consumes supplies, grants overnight rest)
+- **Milestones:** First Night, Deep Dive, Long Haul, Survivalist, etc.
+- **Expedition log** (`!expedition log`) — every event recorded
+
+**Multi-region zones.** T4+ zones have multiple connected regions. `!region` shows where you are, where you can travel, and visited set. Inter-region travel consumes supplies and ticks threat. Base camp is a persistent waypoint per expedition. `!map` renders the full multi-region map.
+
+**Per-zone temporal events** (signature time-based effects on every T2+ zone):
+
+- **Sunken Temple** — tidal cycle floods/recedes rooms
+- **Haunted Manor** — nightly reset; cleared rooms come back
+- **Underforge** — heat accumulation; gear damage rises
+- **Feywild Crossing** — time distortion; days pass at non-uniform rates
+- **Dragon's Lair** — awareness pulses warn the dragon directly
+- **Abyss Portal** — destabilization stack threatens forced collapse
+
+**Extract & resume.** `!extract` bails safely from an expedition. Loot/XP/coins kept, expedition flips to `extracting` status, `!resume` within 7 days picks up from base camp.
+
+**Harvest.** `!forage` / `!mine` / `!fish` / `!scavenge` / `!essence` / `!commune` work in cleared rooms during expeditions, and (Phase R) in single-session `!zone enter` runs too — per-room nodes seeded from the zone resource pool, finite charges, class-specific yield bonuses (Ranger forage/fish, Fighter mine), `!resources` to see what's gatherable. Zone-condition events (tidal block, heat block, manor cursed trinket drops) layer on during expeditions.
+
+**Boss combat.** Every zone's boss is in the bestiary with its own stat block and phase-two narration crossing 50% HP. Win drops the per-zone loot table; T5 always drops a masterwork.
+
+**HP scale.** D&D HP is the source of truth (your sheet says, e.g., `33 max`). The combat engine internally uses a legacy HP scale (calibrated for the old `combat_level`-based curves, ~123 max for a high-level player), but combat outcomes are translated back to D&D scale before display: `HP 33→26 / 33` is what you see, never the engine's internal numbers.
+
+**Holidays.** On recognized holidays (~20/year, religious + cultural calendars), runs start with TwinBee mood +5, expedition outfitting includes a free standard pack, and harvest yields +1 per attempt. Hospital surcharge still applies on holiday deaths.
+
+**Player commands cheat sheet:**
+
+| Command | What it does |
+|---|---|
+| `!setup` | Opt into D&D — pick race + class, inherits your existing progress |
+| `!sheet` | Full character sheet |
+| `!learn` | Mages — pick a spell at level-up |
+| `!subclass` | Inspect / select subclass at L3 |
+| `!rest short` / `!rest long` | Recover HP between fights (1h / 24h cooldowns) |
+| `!check <skill> [dc]` | Roll a skill check |
+| `!zone` / `!zone list` | Zones available at your level |
+| `!zone enter <id>` | Start a single-session run |
+| `!zone advance` | Resolve current room |
+| `!zone status` / `!zone map` / `!zone lore` | Run inspection |
+| `!zone abandon` | End run, no rewards |
+| `!zone taunt` / `!zone compliment` | Poke the DM |
+| `!expedition list` | Zones available at your level |
+| `!expedition start <zone> [Ns] [Md]` | Outfit and begin |
+| `!expedition status` / `!expedition log` | Daily briefing + history |
+| `!expedition abandon` | End expedition (no rewards) |
+| `!camp rough` / `!camp standard` | Make camp |
+| `!region` | Multi-region inspection + travel |
+| `!map` | Full multi-region map |
+| `!forage` / `!mine` / `!scavenge` / `!fish` / `!essence` / `!commune` | Work the room |
+| `!resources` | Inventory of harvested materials |
+| `!threat` | Current threat clock |
+| `!extract` | Bail safely from an expedition |
+| `!resume` | Pick up an extracted expedition |
+| `!respec` | Wipe character (paid; cooldown gated) |
+
+**Compatibility.** Adv 2.0 is fully additive — every pre-2.0 column on `adventure_characters`, `adventure_equipment`, `adventure_inventory`, `adventure_treasures`, `arena_stats`, etc. is preserved with original semantics. Migrations are column-adds with defaults only. Players who haven't run `!setup` keep the legacy adventure shape. `combat_level` becomes the D&D level; treasures become attunements; equipment slots carry forward unchanged.
+
+#### Legacy adventure surface (still active)
+
+The pre-2.0 town economy and supporting systems still work alongside the D&D layer.
 
 | Command | Description |
 |---------|-------------|
-| `!adventure` / `!adv` | Open today's action menu (sent via DM) |
-| `!adventure status` | Character sheet (sent via DM) |
+| `!adventure` / `!adv` | Open today's menu (sent via DM) — now points at `!expedition` and town services |
+| `!adventure status` | Character sheet (legacy view; `!sheet` is the D&D-layer view) |
 | `!adventure shop` | Browse equipment for sale (sent via DM) |
 | `!adventure buy <item>` | Buy equipment by name or tier shorthand (`3 sword`, `t4 boots`) |
 | `!adventure sell <item>` | Sell an inventory item (credits euro balance) |
-| `!adventure sell all` | Sell entire inventory |
+| `!adventure sell all` | Sell entire inventory (consumables protected) |
 | `!adventure equip` | Equip masterwork gear from inventory |
 | `!adventure inventory` | List current inventory |
 | `!adventure leaderboard` | Top adventurers |
 | `!adventure revive @user` | Revive a dead player (admin) |
-| `!adventure respond <choice>` | Reply to today's action prompt (alternative to DM reply) |
 | `!adventure summary` | Force daily summary post (admin) |
 | `!adventure boost` | Double XP/money for all adventurers for a day (admin) |
-| `!adventure babysit [week\|month\|status\|cancel]` | Hire TwinBee to run your daily action (trains your weakest gathering skill) |
+| `!adventure babysit [week\|month\|status\|cancel]` | Hire TwinBee to harvest on your behalf (trains your weakest gathering skill) |
 | `!adventure blacksmith` | Show repair quotes for damaged gear |
 | `!adventure repair [all\|<slot>]` | Repair one slot or all damaged gear at the blacksmith |
 | `!adventure rivals` | Show the rival pool and any open challenges |
 | `!thom [shop\|buy\|pay\|payoff\|autopay\|petbuy]` | Thom Krooke — housing, mortgage, and pet adoption broker |
 | `!hospital` | Check in to St. Guildmore's Memorial Hospital for same-day revival (costs €25k × combat level) |
 
-**DM replies:** Reply to the morning prompt with a number (`1`–`7`) or activity name (`dungeon`, `mine`, `fish`, `forage`, `shop`, `blacksmith`, `rest`). You can specify a location: `1 Soggy Cellar`, `mine 3`, etc.
+#### Skill tracks
 
-#### Activities
-
-Four activity types across 5 tiers of locations. Higher tiers require higher character level and equipment.
-
-- **Dungeon** — combat XP, chance of death, best loot potential
-- **Mining** — mining XP, cave-in risk, ore and gem drops
-- **Fishing** — fishing XP, hazard risk, catch drops
-- **Foraging** — foraging XP, wildlife hazards, herb and reagent drops
+Four skills are tracked separately from D&D level: **Combat (legacy)**, **Mining**, **Foraging**, **Fishing**. They gain XP from harvesting in zones, arena fights, encounters, and (legacy) babysitter actions. Skill levels gate masterwork drops, fishing-zone proficiency bonuses, and crafting recipe unlocks.
 
 #### Mechanics
 
@@ -519,10 +641,9 @@ Four activity types across 5 tiers of locations. Higher tiers require higher cha
 - **Treasures** — rare collectibles (up to 3) that provide passive bonuses (XP multipliers, death chance reduction, loot quality). Prompted to discard when at cap.
 - **Streaks** — consecutive days of activity grant escalating bonuses (XP, loot quality, death chance reduction). Resting resets your streak. Dead players' streaks are frozen — you won't lose your streak to involuntary downtime.
 - **Grudge** — dying at a location marks it as your grudge. Returning there grants +10% success and +25% XP. Clears on success.
-- **Party bonus** — if two players independently visit the same location on the same day, both get +10% loot value.
 - **Death** — locked out for 6 hours. Natural respawn happens automatically when the timer expires. Use `!hospital` for immediate revival at a cost. Death's Reprieve (surviving a lethal roll) sets all equipment to 1 condition instead of destroying it. Dead players' streaks are preserved with a grace period — if you die and can't act on revival day, your streak won't reset.
-- **Holidays** — on recognized holidays (~20/year across religious and cultural calendars), you get a second daily action. Hebrew and Islamic calendar support for floating holidays.
-- **TwinBee NPC** — takes a daily action (location tier capped by best player's combined level), distributes loot share to active players scaled quadratically by level, and occasionally gifts random buffs.
+- **Holidays** — on recognized holidays (~20/year across religious and cultural calendars), runs start with TwinBee mood +5, expedition outfitting includes a free standard pack, and harvest yields +1 per attempt. Hebrew and Islamic calendar support for floating holidays.
+- **TwinBee** — narrates as a mood-driven DM during zone runs and expeditions (see Adv 2.0 above). The legacy daily activity loop is retired in favor of zones/expeditions; the babysitter (below) is the surviving "TwinBee runs an action for you" surface.
 - **Hospital** — St. Guildmore's Memorial Hospital offers same-day revival for dead players. The bill is comically inflated (€125k × combat level) but guild insurance covers 80%, leaving €25k × combat level. Players who can't afford it are discharged back to the natural respawn queue. Nurse Joy provides the bedside manner.
 - **Robbie the Friendly Bandit** — an automated NPC who visits at a random hour each day (8:00–21:00 UTC). Robbie takes sub-tier gear from your inventory (shop gear below your equipped tier, masterwork gear you've outgrown), leaves €50 per item as a "handling fee," and donates everything to the community pot. If he takes masterwork gear and you don't already have one, he drops a "Get Out of Medical Debt Free" card. No player command — Robbie comes to you.
 - **Mid-day events** — random events can trigger between actions, delivering bonus loot, buffs, or narrative encounters.
@@ -544,11 +665,11 @@ Max auto-crafts per combat scales with level: 1 at Foraging 10, 2 at 20, 3 at 30
 
 #### Blacksmith & Repair
 
-Equipment accumulates damage on bad outcomes and breaks at 0 condition. The blacksmith repairs gear for a per-point fee that scales with tier (base rates T0→T5: €1, €2, €5, €12, €30, €80; masterwork and arena gear use the next tier up). The cost has a mild convexity (`baseRate × damage × (1 + damage/200)`), so repairing earlier is slightly cheaper per point than letting gear sit at low condition — but not punitively so. `!adventure blacksmith` previews quotes; `!adventure repair all` or `!adventure repair <slot>` commits. Visiting the blacksmith counts as your daily action.
+Equipment accumulates damage on bad outcomes and breaks at 0 condition. The blacksmith repairs gear for a per-point fee that scales with tier (base rates T0→T5: €1, €2, €5, €12, €30, €80; masterwork and arena gear use the next tier up). The cost has a mild convexity (`baseRate × damage × (1 + damage/200)`), so repairing earlier is slightly cheaper per point than letting gear sit at low condition — but not punitively so. `!adventure blacksmith` previews quotes; `!adventure repair all` or `!adventure repair <slot>` commits.
 
 #### Babysitting Service
 
-Busy days? Hire TwinBee to run your daily action for you. Daily cost is `€100 + combatLevel × €20`. TwinBee trains your weakest gathering skill (mining/fishing/foraging) so the service doubles as catch-up for neglected tracks. Subscribe by the week or month, or check/cancel anytime: `!adventure babysit week|month|status|cancel`.
+Busy days? Hire TwinBee to harvest on your behalf. Daily cost is `€100 + combatLevel × €20`. TwinBee trains your weakest gathering skill (mining/fishing/foraging) each day, so the service doubles as catch-up for neglected tracks. Subscribe by the week or month, or check/cancel anytime: `!adventure babysit week|month|status|cancel`.
 
 #### Rival Duels
 

cmd/expedition-sim/main.go

@@ -0,0 +1,188 @@
+// expedition-sim drives synthetic players through expeditions for batch
+// analysis. Re-uses production plugin paths against a fresh sqlite DB so
+// outcomes mirror what live players hit.
+//
+// Single run:
+//   expedition-sim [-class fighter] [-level 5] [-zone goblin_warrens]
+//                  [-bank 1000] [-cap 50] [-log] [-data DIR]
+//
+// Matrix mode (cartesian sweep over classes × levels × zones × N runs,
+// one JSON object per stdout line, log suppressed by default):
+//   expedition-sim -matrix -classes fighter,mage -levels 5,10 \
+//                  -zones goblin_warrens,wolf_den -runs 20
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"gogobee/internal/plugin"
+
+	"maunium.net/go/mautrix/id"
+)
+
+func main() {
+	var (
+		class   = flag.String("class", "fighter", "DnD class id (single-run mode)")
+		level   = flag.Int("level", 5, "character level (single-run mode)")
+		zone    = flag.String("zone", "goblin_warrens", "zone id (single-run mode)")
+		bank    = flag.Float64("bank", 1000, "starting coin balance — must cover outfitting")
+		cap     = flag.Int("cap", 50, "max autopilot bursts per expedition (each = up to autopilotRoomCap rooms)")
+		dataDir = flag.String("data", "", "data dir for the temp sqlite db (default: OS tempdir; ignored in matrix mode)")
+		userTag = flag.String("user", "@sim:expedition", "synthetic user id (single-run mode)")
+		logFlag = flag.Bool("log", true, "include per-row expedition log in output (single-run default true; matrix default false)")
+
+		matrix  = flag.Bool("matrix", false, "matrix mode — sweep over classes × levels × zones × runs")
+		classes = flag.String("classes", "", "comma-separated class ids (matrix mode)")
+		levels  = flag.String("levels", "", "comma-separated levels (matrix mode)")
+		zones   = flag.String("zones", "", "comma-separated zone ids (matrix mode)")
+		runs    = flag.Int("runs", 1, "replicates per (class,level,zone) cell (matrix mode)")
+
+		trace = flag.Bool("trace", false, "include raw per-round CombatEvent stream on the LAST combat of each expedition (boss room) — for J2 diagnostic sweeps")
+
+		petLevel = flag.Int("pet-level", 0, "attach a base housing pet at this level (1-10) to every sim character; 0 = no pet (default, matches prod char-creation)")
+	)
+	flag.Parse()
+
+	if *petLevel < 0 || *petLevel > 10 {
+		fail("pet-level must be 0-10, got", *petLevel)
+	}
+
+	plugin.SetSimIncludeTrace(*trace)
+	plugin.SetSimPetLevel(*petLevel)
+
+	if *matrix {
+		// Matrix default: drop log to keep stdout manageable; explicit
+		// -log=true overrides.
+		includeLog := false
+		// Flag.Lookup tells us whether the user explicitly set -log.
+		flag.Visit(func(f *flag.Flag) {
+			if f.Name == "log" {
+				includeLog = *logFlag
+			}
+		})
+		runMatrix(*classes, *levels, *zones, *runs, *bank, *cap, includeLog)
+		return
+	}
+
+	runSingle(*class, *level, *zone, *userTag, *dataDir, *bank, *cap, *logFlag)
+}
+
+func runSingle(class string, level int, zone, userTag, dataDir string, bank float64, cap int, includeLog bool) {
+	dir := dataDir
+	if dir == "" {
+		var err error
+		dir, err = os.MkdirTemp("", "expedition-sim-")
+		if err != nil {
+			fail("mkdir temp:", err)
+		}
+		defer os.RemoveAll(dir)
+	}
+
+	res, err := runOne(dir, id.UserID(userTag), plugin.DnDClass(class), level, plugin.ZoneID(zone), bank, cap)
+	if err != nil {
+		if res != nil {
+			if !includeLog {
+				res.Log = nil
+			}
+			emitIndented(res)
+		}
+		fail("run:", err)
+	}
+	if !includeLog {
+		res.Log = nil
+	}
+	emitIndented(res)
+}
+
+func runMatrix(classes, levels, zones string, runs int, bank float64, cap int, includeLog bool) {
+	cs := splitNonEmpty(classes)
+	ls := parseLevels(levels)
+	zs := splitNonEmpty(zones)
+	if len(cs) == 0 || len(ls) == 0 || len(zs) == 0 || runs <= 0 {
+		fail("matrix mode requires non-empty -classes, -levels, -zones and runs > 0")
+	}
+	enc := json.NewEncoder(os.Stdout)
+	for _, c := range cs {
+		for _, lv := range ls {
+			for _, z := range zs {
+				for r := 0; r < runs; r++ {
+					dir, err := os.MkdirTemp("", "expedition-sim-")
+					if err != nil {
+						fail("mkdir temp:", err)
+					}
+					uid := id.UserID(fmt.Sprintf("@sim:%s-l%d-%s-%d", c, lv, z, r))
+					res, runErr := runOne(dir, uid, plugin.DnDClass(c), lv, plugin.ZoneID(z), bank, cap)
+					if res != nil && !includeLog {
+						res.Log = nil
+					}
+					if runErr != nil && res == nil {
+						// Synthesize a row so the corpus has one line per
+						// cell regardless of init failures.
+						res = &plugin.SimResult{
+							UserID:  string(uid),
+							Class:   c,
+							Level:   lv,
+							Zone:    z,
+							Outcome: "halted",
+						}
+					}
+					_ = enc.Encode(res)
+					_ = os.RemoveAll(dir)
+				}
+			}
+		}
+	}
+}
+
+func runOne(dataDir string, uid id.UserID, class plugin.DnDClass, level int, zone plugin.ZoneID, bank float64, cap int) (*plugin.SimResult, error) {
+	runner, err := plugin.NewSimRunner(dataDir)
+	if err != nil {
+		return nil, fmt.Errorf("init runner: %w", err)
+	}
+	defer runner.Close()
+
+	if _, err := runner.BuildCharacter(uid, class, level); err != nil {
+		return nil, fmt.Errorf("build character: %w", err)
+	}
+	runner.Euro.Credit(uid, bank, "expedition-sim bankroll")
+	return runner.RunExpedition(uid, zone, cap)
+}
+
+func emitIndented(res *plugin.SimResult) {
+	enc := json.NewEncoder(os.Stdout)
+	enc.SetIndent("", "  ")
+	_ = enc.Encode(res)
+}
+
+func splitNonEmpty(s string) []string {
+	parts := strings.Split(s, ",")
+	out := parts[:0]
+	for _, p := range parts {
+		if p = strings.TrimSpace(p); p != "" {
+			out = append(out, p)
+		}
+	}
+	return out
+}
+
+func parseLevels(s string) []int {
+	var out []int
+	for _, p := range splitNonEmpty(s) {
+		n, err := strconv.Atoi(p)
+		if err != nil {
+			fail("bad level:", p)
+		}
+		out = append(out, n)
+	}
+	return out
+}
+
+func fail(args ...interface{}) {
+	fmt.Fprintln(os.Stderr, args...)
+	os.Exit(1)
+}

cmd/open5e-import/bestiary.go

@@ -0,0 +1,342 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// open5eMonster is the subset of the Open5e v1 monster schema we consume. The
+// vendored JSON keeps the full payload; unknown fields are ignored here.
+type open5eMonster struct {
+	Slug             string             `json:"slug"`
+	Name             string             `json:"name"`
+	Size             string             `json:"size"`
+	Type             string             `json:"type"`
+	CR               float64            `json:"cr"`
+	ArmorClass       int                `json:"armor_class"`
+	HitPoints        int                `json:"hit_points"`
+	Speed            map[string]any     `json:"speed"`
+	Strength         int                `json:"strength"`
+	Dexterity        int                `json:"dexterity"`
+	Constitution     int                `json:"constitution"`
+	Intelligence     int                `json:"intelligence"`
+	Wisdom           int                `json:"wisdom"`
+	Charisma         int                `json:"charisma"`
+	Actions          []open5eAction     `json:"actions"`
+	LegendaryActions []open5eAction     `json:"legendary_actions"`
+	SpecialAbilities []open5eNamedBlock `json:"special_abilities"`
+}
+
+// open5eAction is one entry in a monster's actions list. An entry is a weapon
+// attack iff DamageDice is non-empty; Multiattack and utility actions leave it
+// blank. AttackBonus/DamageBonus arrive as JSON null on non-attacks, which
+// unmarshals to 0 — harmless, since DamageDice is the attack discriminator.
+type open5eAction struct {
+	Name        string `json:"name"`
+	Desc        string `json:"desc"`
+	AttackBonus int    `json:"attack_bonus"`
+	DamageDice  string `json:"damage_dice"`
+	DamageBonus int    `json:"damage_bonus"`
+}
+
+type open5eNamedBlock struct {
+	Name string `json:"name"`
+}
+
+type monstersPage struct {
+	Next    string          `json:"next"`
+	Results []open5eMonster `json:"results"`
+}
+
+// fetchMonsters pages through the SRD monster list and writes the full result
+// set to data/open5e/monsters.json, pretty-printed for a reviewable diff.
+func fetchMonsters() error {
+	client := &http.Client{Timeout: 30 * time.Second}
+	var all []open5eMonster
+	url := monstersAPIBase
+	for url != "" {
+		fmt.Fprintln(os.Stderr, "GET", url)
+		page, err := getMonstersPage(client, url)
+		if err != nil {
+			return err
+		}
+		all = append(all, page.Results...)
+		url = page.Next
+	}
+	fmt.Fprintf(os.Stderr, "fetched %d monsters\n", len(all))
+
+	if err := os.MkdirAll(filepath.Dir(monstersJSON), 0o755); err != nil {
+		return err
+	}
+	out, err := json.MarshalIndent(all, "", "  ")
+	if err != nil {
+		return err
+	}
+	out = append(out, '\n')
+	return os.WriteFile(monstersJSON, out, 0o644)
+}
+
+func getMonstersPage(client *http.Client, url string) (*monstersPage, error) {
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("%s: HTTP %d", url, resp.StatusCode)
+	}
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	var page monstersPage
+	if err := json.Unmarshal(body, &page); err != nil {
+		return nil, err
+	}
+	return &page, nil
+}
+
+// ── Staging-table classifier ─────────────────────────────────────────────────
+
+// genStatBlock mirrors plugin.SRDStatBlock — a raw SRD stat block. These values
+// are NOT engine-tuned: raw SRD damage one-shots gogobee's solo player (see
+// bestiary_srd.go). The staging table is a balance baseline the hand-authored
+// dndBestiary / srdProfiles tuning pass reads against, not a drop-in roster.
+type genStatBlock struct {
+	Slug, Name  string
+	Size, Type  string
+	CR          float64
+	XP          int
+	HP, AC      int
+	SpeedWalk   int
+	STR, DEX    int
+	CON, INT    int
+	WIS, CHA    int
+	Multiattack string
+	Attacks     []genStatAttack
+	Traits      []string
+	Legendary   bool
+}
+
+type genStatAttack struct {
+	Name        string
+	AttackBonus int
+	DamageDice  string
+	DamageBonus int
+	AvgDamage   int
+	DamageType  string
+}
+
+// xpByCR is the SRD experience-by-challenge-rating table. Open5e exposes no XP
+// field, but the tuning pass wants it, so it is derived here from CR.
+var xpByCR = map[float64]int{
+	0: 10, 0.125: 25, 0.25: 50, 0.5: 100,
+	1: 200, 2: 450, 3: 700, 4: 1100, 5: 1800, 6: 2300, 7: 2900, 8: 3900,
+	9: 5000, 10: 5900, 11: 7200, 12: 8400, 13: 10000, 14: 11500, 15: 13000,
+	16: 15000, 17: 18000, 18: 20000, 19: 22000, 20: 25000, 21: 33000,
+	22: 41000, 23: 50000, 24: 62000, 25: 75000, 26: 90000, 27: 105000,
+	28: 120000, 29: 135000, 30: 155000,
+}
+
+// genBestiary reads the vendored monsters.json, classifies every SRD monster
+// into a raw staging stat block, and writes the generated Go data file.
+func genBestiary() error {
+	raw, err := os.ReadFile(monstersJSON)
+	if err != nil {
+		return fmt.Errorf("read %s (run `fetch bestiary` first?): %w", monstersJSON, err)
+	}
+	var src []open5eMonster
+	if err := json.Unmarshal(raw, &src); err != nil {
+		return err
+	}
+
+	blocks := make([]genStatBlock, 0, len(src))
+	var attacks int
+	for _, m := range src {
+		b := classifyMonster(m)
+		attacks += len(b.Attacks)
+		blocks = append(blocks, b)
+	}
+	sort.Slice(blocks, func(i, j int) bool {
+		if blocks[i].CR != blocks[j].CR {
+			return blocks[i].CR < blocks[j].CR
+		}
+		return blocks[i].Slug < blocks[j].Slug
+	})
+	fmt.Fprintf(os.Stderr, "classified %d monsters (%d parsed attacks)\n", len(blocks), attacks)
+
+	out := emitBestiary(blocks)
+	if err := os.WriteFile(bestiaryGenGo, out, 0o644); err != nil {
+		return err
+	}
+	fmt.Fprintln(os.Stderr, "wrote", bestiaryGenGo)
+	return nil
+}
+
+func classifyMonster(m open5eMonster) genStatBlock {
+	b := genStatBlock{
+		Slug: strings.ReplaceAll(m.Slug, "-", "_"),
+		Name: m.Name,
+		Size: strings.ToLower(strings.TrimSpace(m.Size)),
+		Type: strings.ToLower(strings.TrimSpace(m.Type)),
+		CR:   m.CR,
+		XP:   xpByCR[m.CR],
+		HP:   m.HitPoints,
+		AC:   m.ArmorClass,
+		STR:  m.Strength, DEX: m.Dexterity, CON: m.Constitution,
+		INT: m.Intelligence, WIS: m.Wisdom, CHA: m.Charisma,
+		SpeedWalk: speedWalk(m.Speed),
+		Legendary: len(m.LegendaryActions) > 0,
+	}
+	for _, a := range m.Actions {
+		if strings.EqualFold(strings.TrimSpace(a.Name), "Multiattack") {
+			b.Multiattack = firstSentence(strings.TrimSpace(a.Desc), 200)
+			continue
+		}
+		if a.DamageDice == "" {
+			continue
+		}
+		atk := genStatAttack{
+			Name:        a.Name,
+			AttackBonus: a.AttackBonus,
+			DamageDice:  strings.ReplaceAll(a.DamageDice, " ", ""),
+			DamageBonus: a.DamageBonus,
+		}
+		atk.AvgDamage = int(avgDice(atk.DamageDice)) + a.DamageBonus
+		if mt := reDmgType.FindStringSubmatch(strings.ToLower(a.Desc)); mt != nil {
+			atk.DamageType = strings.ToLower(mt[1])
+		}
+		b.Attacks = append(b.Attacks, atk)
+	}
+	for _, sa := range m.SpecialAbilities {
+		if n := strings.TrimSpace(sa.Name); n != "" {
+			b.Traits = append(b.Traits, n)
+		}
+	}
+	return b
+}
+
+// speedWalk pulls the walking speed (in feet) out of Open5e's speed object,
+// falling back to the fastest other movement mode for creatures with no walk
+// speed (flyers, swimmers). Returns 0 when nothing parses.
+func speedWalk(speed map[string]any) int {
+	asInt := func(v any) int {
+		if f, ok := v.(float64); ok {
+			return int(f)
+		}
+		return 0
+	}
+	if w := asInt(speed["walk"]); w > 0 {
+		return w
+	}
+	best := 0
+	for mode, v := range speed {
+		if mode == "walk" {
+			continue
+		}
+		if n := asInt(v); n > best {
+			best = n
+		}
+	}
+	return best
+}
+
+// avgDice returns the statistical average of an NdM dice expression. A bare or
+// unparseable expression yields 0 — the staging table records what it can and
+// leaves the rest for the tuning pass.
+func avgDice(dice string) float64 {
+	i := strings.IndexByte(dice, 'd')
+	if i <= 0 {
+		return 0
+	}
+	n, err1 := strconv.Atoi(dice[:i])
+	m, err2 := strconv.Atoi(dice[i+1:])
+	if err1 != nil || err2 != nil || n <= 0 || m <= 0 {
+		return 0
+	}
+	return float64(n) * (float64(m) + 1) / 2
+}
+
+// ── Code emission ────────────────────────────────────────────────────────────
+
+func emitBestiary(blocks []genStatBlock) []byte {
+	var b bytes.Buffer
+	b.WriteString(`// Code generated by cmd/open5e-import. DO NOT EDIT.
+//
+// Source: Open5e SRD monster dump (data/open5e/monsters.json), 5e SRD content
+// under CC-BY-4.0 — see NOTICE. Regenerate with:
+//
+//	go run ./cmd/open5e-import fetch bestiary
+//	go run ./cmd/open5e-import gen bestiary
+//
+// This is the RAW SRD staging table — see bestiary_srd_staging.go for why these
+// values are a balance baseline and not a drop-in engine roster.
+
+package plugin
+
+func buildSRDStagingBestiary() map[string]SRDStatBlock {
+	return map[string]SRDStatBlock{
+`)
+	for _, m := range blocks {
+		fmt.Fprintf(&b, "\t\t%q: {Slug: %q, Name: %q", m.Slug, m.Slug, m.Name)
+		if m.Size != "" {
+			fmt.Fprintf(&b, ", Size: %q", m.Size)
+		}
+		if m.Type != "" {
+			fmt.Fprintf(&b, ", Type: %q", m.Type)
+		}
+		fmt.Fprintf(&b, ", CR: %s", strconv.FormatFloat(m.CR, 'g', -1, 64))
+		if m.XP != 0 {
+			fmt.Fprintf(&b, ", XP: %d", m.XP)
+		}
+		fmt.Fprintf(&b, ", HP: %d, AC: %d", m.HP, m.AC)
+		if m.SpeedWalk != 0 {
+			fmt.Fprintf(&b, ", SpeedWalk: %d", m.SpeedWalk)
+		}
+		fmt.Fprintf(&b, ", STR: %d, DEX: %d, CON: %d, INT: %d, WIS: %d, CHA: %d",
+			m.STR, m.DEX, m.CON, m.INT, m.WIS, m.CHA)
+		if m.Multiattack != "" {
+			fmt.Fprintf(&b, ", Multiattack: %q", m.Multiattack)
+		}
+		if len(m.Attacks) > 0 {
+			b.WriteString(", Attacks: []SRDStatAttack{")
+			for i, a := range m.Attacks {
+				if i > 0 {
+					b.WriteString(", ")
+				}
+				fmt.Fprintf(&b, "{Name: %q, AttackBonus: %d, DamageDice: %q, DamageBonus: %d, AvgDamage: %d",
+					a.Name, a.AttackBonus, a.DamageDice, a.DamageBonus, a.AvgDamage)
+				if a.DamageType != "" {
+					fmt.Fprintf(&b, ", DamageType: %q", a.DamageType)
+				}
+				b.WriteString("}")
+			}
+			b.WriteString("}")
+		}
+		if len(m.Traits) > 0 {
+			b.WriteString(", Traits: []string{")
+			for i, t := range m.Traits {
+				if i > 0 {
+					b.WriteString(", ")
+				}
+				fmt.Fprintf(&b, "%q", t)
+			}
+			b.WriteString("}")
+		}
+		if m.Legendary {
+			b.WriteString(", Legendary: true")
+		}
+		b.WriteString("},\n")
+	}
+	b.WriteString("\t}\n}\n")
+	return b.Bytes()
+}

cmd/open5e-import/desc_overrides.go

@@ -0,0 +1,152 @@
+package main
+
+import (
+	"regexp"
+	"strings"
+)
+
+// Description-cleaning hooks shared by the spell and magic-item generators.
+//
+// The Open5e dump descriptions are SRD prose pulled verbatim — they leak
+// "within range," "WIS saving throw," "your Constitution score is 19," and
+// other rules-text the game now hides. This file handles two layers:
+//
+//   - A sanitizer (cleanDesc) strips the worst jargon clauses from the auto
+//     first-sentence and tidies the result. Used as the default path.
+//   - Per-ID override maps win outright when a description needs more than
+//     mechanical scrubbing (e.g. Amulet of Health's "score is 19," all of
+//     the Mage default-list cantrips). Hand-author here, not in the
+//     generated file — these survive a regen.
+
+// spellDescOverride wins over the auto-derived first-sentence Description
+// when the slug matches. Cover anything that surfaces in the player's
+// spellbook listing (defaultKnownSpells) or the !spells available command.
+//
+// Tone target: outcome-first, second person, plain English. No DC, no slot
+// jargon, no "within range." Match the voice already in dnd_spells_data.go.
+var spellDescOverride = map[string]string{
+	// SRD-only spells that appear in defaultKnownSpells (no hand-authored
+	// overlay in dnd_spells_data.go). Sourced from the S3 surfaced-spells
+	// audit; each gives the player a one-line read of what it does, with
+	// just enough bite that the spellbook isn't a phone book.
+	"call_lightning":   "Summon a sulking thundercloud, then ask it — politely — to drop a bolt on someone you dislike.",
+	"charm_person":     "Sweet-talk a humanoid into treating you as their new favourite acquaintance. Wears off; they may notice.",
+	"conjure_animals":  "Call up a posse of summoned beasts. They are very enthusiastic and only mostly trained.",
+	"eldritch_blast":   "A beam of crackling otherworldly Whatever streaks at a target. Your patron's preferred greeting.",
+	"entangle":         "The ground sprouts rude, grabby roots in a patch. Anyone caught looks undignified at best.",
+	"faerie_fire":      "Outline targets in glittery light. They can't hide; you hit them more easily; they hate it.",
+	"fear":             "Project a cone of pure dread. Brave folk turn and run; less brave folk were already running.",
+	"flaming_sphere":   "A rolling ball of fire shows up and goes wherever you point. Carpet not included.",
+	"haste":            "An ally surges with speed — extra ground, sharper defences, an extra swing. Brief, glorious, exhausting.",
+	"healing_word":     "Bark a healing syllable across the battlefield. An ally finds themselves slightly less dead.",
+	"heat_metal":       "Their weapon, their armour, their belt buckle — glowing red-hot. Hard to grip. Worse to wear.",
+	"heroism":          "An ally takes courage. No fear, more grit, slightly insufferable battle cries.",
+	"hideous_laughter": "Target collapses in a fit of unstoppable giggling. Awkward for them, very funny for you.",
+	"insect_plague":    "A swarm of biting locusts boils up in an area. Everyone inside has Opinions about it.",
+	"invisibility":     "An ally fades from sight. Lasts until they attack, cast, or yell something dramatic.",
+	"produce_flame":    "A flame springs to your palm. Use it as a torch, or sling it at someone. Multipurpose.",
+	"ray_of_frost":     "A freezing beam catches a target and leaves them sluggish, frosted, and visibly cross.",
+	"vampiric_touch":   "Drain life from a target. The damage you deal patches you up. Frowned upon at parties.",
+	"vicious_mockery":  "Hurl an insult so cutting it physically hurts. Their next swing wobbles in shame.",
+
+	// Hand-authored overlay descriptions in dnd_spells_data.go are the
+	// canonical text and win at registry merge time, so they don't need
+	// entries here. If a spell ever moves out of buildSpellList(), add it
+	// above.
+}
+
+// magicItemDescOverride wins over the auto-derived Desc when the slug
+// matches. Priority targets: items the plan called out by name (Amulet of
+// Health, Belt of Giant Strength) and any item whose SRD blurb leaks rules
+// math or names a spell the player can't cast.
+var magicItemDescOverride = map[string]string{
+	"amulet_of_health":                "Hums against your collarbone and quietly upgrades your constitution to 'bothersome to kill.'",
+	"belt_of_giant_strength_hill":     "Buckle it on; suddenly you can deadlift the bartender. Hill-giant grade.",
+	"belt_of_giant_strength_stone":    "Buckle it on; the floor creaks where you weren't standing yesterday. Stone-giant grade.",
+	"belt_of_giant_strength_frost":    "Buckle it on; doors come off their hinges when you knock politely. Frost-giant grade.",
+	"belt_of_giant_strength_fire":     "Buckle it on; furniture rearranges itself to be elsewhere. Fire-giant grade.",
+	"belt_of_giant_strength_cloud":    "Buckle it on; you arm-wrestle siege engines for fun. Cloud-giant grade.",
+	"belt_of_giant_strength_storm":    "Buckle it on; the world feels strangely flimsy. Storm-giant grade.",
+	"belt_of_hill_giant_strength":     "Buckle it on; suddenly you can deadlift the bartender. Hill-giant grade.",
+	"belt_of_stone_giant_strength":    "Buckle it on; the floor creaks where you weren't standing yesterday. Stone-giant grade.",
+	"belt_of_frost_giant_strength":    "Buckle it on; doors come off their hinges when you knock politely. Frost-giant grade.",
+	"belt_of_fire_giant_strength":     "Buckle it on; furniture rearranges itself to be elsewhere. Fire-giant grade.",
+	"belt_of_cloud_giant_strength":    "Buckle it on; you arm-wrestle siege engines for fun. Cloud-giant grade.",
+	"belt_of_storm_giant_strength":    "Buckle it on; the world feels strangely flimsy. Storm-giant grade.",
+	"belt_of_dwarvenkind":             "A stout dwarven belt — beard not included, hardiness very much included.",
+	"boots_of_levitation":             "Float upward at will. Down is a separate problem you'll figure out later.",
+	"boots_of_speed":                  "Click the heels together; the world starts moving at a polite walking pace.",
+	"boots_of_striding_and_springing": "Tireless stride and effortless hops. Ceilings: now optional.",
+	"boots_of_the_winterlands":        "Snow doesn't slow you, cold doesn't bite, and your tracks tactfully erase themselves.",
+	"bracers_of_archery":              "Steady your bow arm — your arrows hit harder and find seams in armour they shouldn't.",
+	"bracers_of_defense":              "Light bracers that quietly turn aside blows. No armour required, no questions asked.",
+	"brooch_of_shielding":             "Pinned to your cloak. Eats incoming bolts of force like they're hors d'oeuvres.",
+	"cloak_of_displacement":           "Bends light around you. Attackers keep swinging at where you obviously are, and missing.",
+	"cloak_of_elvenkind":              "Pulls shadows around you whether you asked or not. Watchful eyes slide right off.",
+	"cloak_of_protection":             "A perfectly ordinary travelling cloak that perfectly extraordinarily refuses to let you get hit.",
+	"cloak_of_resistance":             "Wards off one kind of harm — fire, frost, lightning, poison, or some other unpleasant Tuesday.",
+	"cloak_of_the_bat":                "By night you glide instead of fall; on a really good night, you fly. Daytime: just a cloak.",
+	"cloak_of_the_manta_ray":          "Underwater, you swim like a manta and breathe like you're on land. On land, you look damp.",
+	"gauntlets_of_ogre_power":         "Heavy gauntlets that lend you an ogre's strength and an ogre's complete disregard for door frames.",
+	"headband_of_intellect":           "Slips on, makes you think clever thoughts you have no business thinking. People notice.",
+	"ring_of_protection":              "A plain ring. Quietly turns aside blows you'd otherwise take. Refuses to explain how.",
+	"ring_of_regeneration":            "Wounds knit themselves back together while you wear it. Slowly. Smugly.",
+	"ring_of_resistance":              "Wards off one kind of harm — fire, frost, lightning, poison, or another flavour of bad day.",
+	"ring_of_swimming":                "Slip through water faster than any swimmer should. Dolphins file complaints.",
+	"ring_of_warmth":                  "Cold weather no longer applies to you. Chill damage softens; you become unbearable in winter.",
+	"slippers_of_spider_climbing":     "Walk up walls and across ceilings as if the floor were merely a suggestion.",
+}
+
+// cleanDesc strips the worst SRD jargon from a description before it lands in
+// the generated file. It is intentionally conservative: drop offending phrases,
+// collapse the resulting whitespace, leave the rest of the sentence alone. Any
+// description that still reads poorly after this pass should get a hand-authored
+// entry in spellDescOverride / magicItemDescOverride above.
+func cleanDesc(s string) string {
+	if s == "" {
+		return s
+	}
+	for _, pat := range descScrub {
+		s = pat.ReplaceAllString(s, "")
+	}
+	// Collapse runs of whitespace and tidy stray punctuation orphans left
+	// behind by deletions ("a creature  and ", " , ", " .").
+	s = reSpaces.ReplaceAllString(s, " ")
+	s = strings.ReplaceAll(s, " ,", ",")
+	s = strings.ReplaceAll(s, " .", ".")
+	s = strings.ReplaceAll(s, "( )", "")
+	// Repair sentence stubs left by clause-strippers — "...must make." after
+	// the saving-throw object is gone, or trailing " and." where one half of
+	// a coordinated noun phrase was removed. These are conservative: they
+	// only fire when the orphan sits at end-of-sentence.
+	s = reOrphanMustMake.ReplaceAllString(s, "$1")
+	s = reOrphanTrailingAnd.ReplaceAllString(s, ".")
+	s = strings.TrimSpace(s)
+	return s
+}
+
+var (
+	reSpaces            = regexp.MustCompile(`\s+`)
+	reOrphanMustMake    = regexp.MustCompile(`(?i)\s+must\s+(?:make|succeed on|attempt)([.,;])`)
+	reOrphanTrailingAnd = regexp.MustCompile(`(?i),?\s+and\.`)
+	descScrub = []*regexp.Regexp{
+		// Range / distance jargon.
+		regexp.MustCompile(`(?i)\s*\bwithin range\b`),
+		regexp.MustCompile(`(?i)\s*\bwithin \d+ feet(?: of [a-z ]+?)?`),
+		regexp.MustCompile(`(?i)\s+\d+-foot[- ](?:radius|cone|cube|line|sphere|square)`),
+		regexp.MustCompile(`(?i)\s+(?:out to a range of\s*)?\d+ feet\b`),
+		regexp.MustCompile(`(?i)\s+out to a range of\b`),
+		// Save / DC / slot jargon.
+		regexp.MustCompile(`(?i)\s*\b(?:Strength|Dexterity|Constitution|Intelligence|Wisdom|Charisma)\s+saving throws?\b`),
+		regexp.MustCompile(`(?i)\s*\bsaving throws?\b`),
+		regexp.MustCompile(`(?i)\s*\(save(?:\s+DC\s*\d+)?\)`),
+		regexp.MustCompile(`(?i)\s*\bDC\s*\d+\b`),
+		regexp.MustCompile(`(?i)\s*\b(?:using|cast(?:ing)?(?: it)? with) a spell slot of \d+(?:st|nd|rd|th) level or higher\b`),
+		regexp.MustCompile(`(?i)\s*\bspell slot\b`),
+		// Cross-references and stat-block leakage.
+		regexp.MustCompile(`(?i)\s*\bsee the spell\b`),
+		regexp.MustCompile(`(?i)\s*\b(?:wisdom|strength|dexterity|constitution|intelligence|charisma)\s+save\b`),
+		regexp.MustCompile(`(?i)\s*\b(?:wisdom|strength|dexterity|constitution|intelligence|charisma)\s+score\s+is\s+\d+\b`),
+		regexp.MustCompile(`(?i)\s*\bconstitution score\b`),
+	}
+)

cmd/open5e-import/desc_overrides_test.go

@@ -0,0 +1,122 @@
+package main
+
+import (
+	"strings"
+	"testing"
+)
+
+// TestCleanDescStripsJargon — the S3 acceptance criteria translated into
+// regression cases. Any phrase listed here must not survive the sanitizer.
+func TestCleanDescStripsJargon(t *testing.T) {
+	cases := []struct {
+		name    string
+		in      string
+		mustNot []string
+	}{
+		{
+			name: "saving throw + DC",
+			in:   "Each creature in the area must make a Dexterity saving throw (DC 15) or take damage.",
+			mustNot: []string{
+				"saving throw", "DC 15", "DC15",
+			},
+		},
+		{
+			name:    "saving throws plural",
+			in:      "You have advantage on saving throws against spells.",
+			mustNot: []string{"saving throws"},
+		},
+		{
+			name:    "within range",
+			in:      "Hurl a bolt at a creature within range.",
+			mustNot: []string{"within range"},
+		},
+		{
+			name:    "5-foot radius",
+			in:      "Each creature in a 5-foot radius takes damage.",
+			mustNot: []string{"5-foot"},
+		},
+		{
+			name:    "spell slot upcast clause",
+			in:      "When you cast this spell using a spell slot of 2nd level or higher, the damage increases.",
+			mustNot: []string{"spell slot"},
+		},
+		{
+			name:    "constitution score",
+			in:      "Your Constitution score is 19 while you wear this amulet.",
+			mustNot: []string{"Constitution score"},
+		},
+		{
+			name:    "(save DC X) parenthetical",
+			in:      "You can use an action to cast the detect thoughts spell (save DC 13) from it.",
+			mustNot: []string{"(save", "DC 13"},
+		},
+		{
+			name:    "wisdom save",
+			in:      "Forces a wisdom save against the caster.",
+			mustNot: []string{"wisdom save"},
+		},
+		{
+			name:    "out to a range of feet",
+			in:      "You have darkvision out to a range of 60 feet.",
+			mustNot: []string{"feet", "out to a range"},
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := cleanDesc(tc.in)
+			low := strings.ToLower(got)
+			for _, ban := range tc.mustNot {
+				if strings.Contains(low, strings.ToLower(ban)) {
+					t.Errorf("cleanDesc kept banned phrase %q\n  in:  %q\n  out: %q", ban, tc.in, got)
+				}
+			}
+		})
+	}
+}
+
+// TestCleanDescRepairsOrphans — the strippers leave dangling stubs ("must
+// make.", " and."); the post-pass is meant to tidy them so player-facing
+// prose doesn't end mid-clause.
+func TestCleanDescRepairsOrphans(t *testing.T) {
+	in := "You gain a +1 bonus to ability checks and saving throws."
+	got := cleanDesc(in)
+	if strings.HasSuffix(got, " and.") {
+		t.Errorf("orphan trailing 'and.' survived: %q", got)
+	}
+	in2 := "Up to three creatures of your choice that you can see must make charisma saving throws."
+	got2 := cleanDesc(in2)
+	if strings.Contains(strings.ToLower(got2), "must make.") {
+		t.Errorf("orphan 'must make.' survived: %q", got2)
+	}
+}
+
+// TestStripNameParenthetical — bestiary R21 / magic-item alias names.
+func TestStripNameParenthetical(t *testing.T) {
+	cases := map[string]string{
+		"Giant Rat (Diseased)":          "Giant Rat",
+		"Deep Gnome (Svirfneblin)":      "Deep Gnome",
+		"Stone of Good Luck (Luckstone)": "Stone of Good Luck",
+		"Ordinary Name":                 "Ordinary Name",
+		"":                              "",
+	}
+	for in, want := range cases {
+		if got := stripNameParenthetical(in); got != want {
+			t.Errorf("stripNameParenthetical(%q) = %q, want %q", in, got, want)
+		}
+	}
+}
+
+// TestSpellOverrideWins — the curated descriptions for the SRD-only default
+// spells must beat the auto first-sentence path.
+func TestSpellOverrideWins(t *testing.T) {
+	got := spellDescription("vicious_mockery", "anything could go here")
+	if got != spellDescOverride["vicious_mockery"] {
+		t.Errorf("override didn't win: got %q", got)
+	}
+	// Unknown ID falls through to cleanDesc.
+	in := "Hurl a bolt at a creature within range."
+	got = spellDescription("unknown_spell_xyz", in)
+	if strings.Contains(got, "within range") {
+		t.Errorf("fallthrough didn't sanitize: %q", got)
+	}
+}

cmd/open5e-import/gen.go

@@ -0,0 +1,339 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"os"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+// classEnum maps an Open5e spell_lists entry to the plugin's DnDClass enum
+// identifier. Open5e's "wizard" is the plugin's Mage; classes the plugin
+// doesn't model (artificer, etc.) are absent and silently dropped.
+//
+// classOrder fixes the iteration order so generated Classes slices are stable.
+var (
+	classEnum = map[string]string{
+		"wizard":   "ClassMage",
+		"cleric":   "ClassCleric",
+		"ranger":   "ClassRanger",
+		"druid":    "ClassDruid",
+		"bard":     "ClassBard",
+		"sorcerer": "ClassSorcerer",
+		"warlock":  "ClassWarlock",
+		"paladin":  "ClassPaladin",
+	}
+	classOrder = []string{"wizard", "cleric", "ranger", "druid", "bard", "sorcerer", "warlock", "paladin"}
+)
+
+// mapClasses turns an Open5e spell's class tags into plugin enum identifiers,
+// deduped and in classOrder. It unions the structured spell_lists array with
+// the free-text dnd_class field ("Druid, Wizard") — the SRD dump's spell_lists
+// omits paladin entirely, so dnd_class is the more complete source. Returns
+// nil when the spell belongs to no modelled class (the caller drops those —
+// they have no caster to learn them).
+func mapClasses(lists []string, dndClass string) []string {
+	seen := map[string]bool{}
+	for _, l := range lists {
+		seen[strings.ToLower(strings.TrimSpace(l))] = true
+	}
+	for _, l := range strings.Split(dndClass, ",") {
+		seen[strings.ToLower(strings.TrimSpace(l))] = true
+	}
+	var out []string
+	for _, c := range classOrder {
+		if seen[c] {
+			out = append(out, classEnum[c])
+		}
+	}
+	return out
+}
+
+// genSpell is a fully classified spell ready for code emission. Fields mirror
+// plugin.SpellDefinition; enum-typed fields hold the Go identifier as a string.
+type genSpell struct {
+	ID            string
+	Name          string
+	Level         int
+	School        string
+	Classes       []string
+	Effect        string
+	CastTime      string
+	Concentration bool
+	SaveStat      string
+	AttackRoll    bool
+	DamageDice    string
+	DamageType    string
+	Description   string
+	Upcast        string
+	MaterialCost  int
+	AOE           bool
+}
+
+// genSpells reads the vendored spells.json, classifies every in-scope spell,
+// and writes the generated Go data file.
+func genSpells() error {
+	raw, err := os.ReadFile(spellsJSON)
+	if err != nil {
+		return fmt.Errorf("read %s (run `fetch spells` first?): %w", spellsJSON, err)
+	}
+	var src []open5eSpell
+	if err := json.Unmarshal(raw, &src); err != nil {
+		return err
+	}
+
+	var spells []genSpell
+	var skippedLevel, skippedNoClass int
+	for _, s := range src {
+		if s.LevelInt > 5 {
+			// Combat caps at L5 spell slots — nothing can ever cast these.
+			skippedLevel++
+			continue
+		}
+		classes := mapClasses(s.SpellLists, s.DndClass)
+		if len(classes) == 0 {
+			skippedNoClass++
+			continue
+		}
+		spells = append(spells, classify(s, classes))
+	}
+	sort.Slice(spells, func(i, j int) bool {
+		if spells[i].Level != spells[j].Level {
+			return spells[i].Level < spells[j].Level
+		}
+		return spells[i].ID < spells[j].ID
+	})
+	fmt.Fprintf(os.Stderr, "classified %d spells (skipped %d level>5, %d no modelled class)\n",
+		len(spells), skippedLevel, skippedNoClass)
+
+	out := emit(spells)
+	if err := os.WriteFile(spellsGenGo, out, 0o644); err != nil {
+		return err
+	}
+	fmt.Fprintln(os.Stderr, "wrote", spellsGenGo)
+	return nil
+}
+
+// ── Classifier ───────────────────────────────────────────────────────────────
+
+var (
+	reSave      = regexp.MustCompile(`(Strength|Dexterity|Constitution|Intelligence|Wisdom|Charisma) saving throw`)
+	reDice      = regexp.MustCompile(`\d+d\d+(?:\s*\+\s*\d+)?`)
+	reDmgType   = regexp.MustCompile(`(?i)(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder)\s+damage`)
+	reMaterial  = regexp.MustCompile(`(?i)worth (?:at least )?([\d,]+)\s*gp`)
+	saveStatMap = map[string]string{
+		"Strength": "STR", "Dexterity": "DEX", "Constitution": "CON",
+		"Intelligence": "INT", "Wisdom": "WIS", "Charisma": "CHA",
+	}
+)
+
+func classify(s open5eSpell, classes []string) genSpell {
+	desc := strings.TrimSpace(s.Desc)
+	low := strings.ToLower(desc)
+
+	g := genSpell{
+		ID:            strings.ReplaceAll(s.Slug, "-", "_"),
+		Name:          s.Name,
+		Level:         s.LevelInt,
+		School:        strings.ToLower(strings.TrimSpace(s.School)),
+		Classes:       classes,
+		Concentration: s.RequiresConcentration,
+		Description:   spellDescription(strings.ReplaceAll(s.Slug, "-", "_"), desc),
+		Upcast:        firstSentence(strings.TrimSpace(s.HigherLevel), 200),
+		AOE:           looksAOE(low),
+	}
+
+	// Cast time. Reaction/bonus action win over the ritual flag.
+	ct := strings.ToLower(s.CastingTime)
+	switch {
+	case strings.Contains(ct, "bonus action"):
+		g.CastTime = "CastBonusAction"
+	case strings.Contains(ct, "reaction"):
+		g.CastTime = "CastReaction"
+	case s.CanBeCastAsRitual:
+		g.CastTime = "CastRitual"
+	default:
+		g.CastTime = "CastAction"
+	}
+
+	if m := reSave.FindStringSubmatch(desc); m != nil {
+		g.SaveStat = saveStatMap[m[1]]
+	}
+	g.AttackRoll = strings.Contains(low, "spell attack")
+	if m := reDice.FindString(desc); m != "" {
+		g.DamageDice = strings.ReplaceAll(m, " ", "")
+	}
+	if m := reDmgType.FindStringSubmatch(low); m != nil {
+		g.DamageType = strings.ToLower(m[1])
+	}
+	if m := reMaterial.FindStringSubmatch(s.Material); m != nil {
+		g.MaterialCost, _ = strconv.Atoi(strings.ReplaceAll(m[1], ",", ""))
+	}
+
+	g.Effect = classifyEffect(g, low)
+
+	// A heal spell's dice describe healing, not damage — keep DamageDice (the
+	// hand-authored list does the same) but drop a stray damage type.
+	if g.Effect == "EffectSpellHeal" {
+		g.DamageType = ""
+	}
+	// Non-damaging effects shouldn't carry a damage type/dice picked up from
+	// incidental wording.
+	if g.Effect == "EffectControl" || g.Effect == "EffectUtility" ||
+		g.Effect == "EffectReaction" {
+		g.DamageDice, g.DamageType = "", ""
+	}
+	return g
+}
+
+// classifyEffect picks the SpellEffectKind. Heuristic and imperfect by design —
+// the hand-authored buildSpellList() overlay is the refinement path, so this
+// only needs to be a reasonable default.
+func classifyEffect(g genSpell, low string) string {
+	if g.CastTime == "CastReaction" {
+		return "EffectReaction"
+	}
+	isHeal := strings.Contains(low, "regain") && strings.Contains(low, "hit point") &&
+		!strings.Contains(low, "damage")
+	if isHeal {
+		return "EffectSpellHeal"
+	}
+	if g.DamageDice != "" && g.DamageType != "" {
+		switch {
+		case g.AttackRoll:
+			return "EffectDamageAttack"
+		case g.SaveStat != "":
+			return "EffectDamageSave"
+		default:
+			return "EffectDamageAuto"
+		}
+	}
+	if g.SaveStat != "" {
+		return "EffectControl"
+	}
+	// Light buff detection — anything still unclassified falls through to
+	// utility, which is the safe bucket.
+	if strings.Contains(low, "bonus to") || strings.Contains(low, "you gain") ||
+		strings.Contains(low, "gains a bonus") || strings.Contains(low, "your ac") {
+		if strings.Contains(low, "you gain") || strings.Contains(low, "yourself") ||
+			strings.Contains(low, "your ac") {
+			return "EffectBuffSelf"
+		}
+		return "EffectBuffAlly"
+	}
+	return "EffectUtility"
+}
+
+func looksAOE(low string) bool {
+	for _, kw := range []string{
+		"each creature", "all creatures", "-foot radius", "-foot-radius",
+		"foot cone", "foot cube", "foot line", "foot-radius sphere",
+	} {
+		if strings.Contains(low, kw) {
+			return true
+		}
+	}
+	return false
+}
+
+// spellDescription returns the description text emitted for a spell. A
+// hand-authored override in spellDescOverride wins outright; otherwise the
+// SRD first-sentence is run through cleanDesc to strip jargon clauses.
+func spellDescription(id, raw string) string {
+	if s, ok := spellDescOverride[id]; ok {
+		return s
+	}
+	return firstSentence(cleanDesc(raw), 200)
+}
+
+// firstSentence trims free-text fields down to a single sentence, capped at
+// max runes, so generated Description/Upcast stay terminal-friendly.
+func firstSentence(s string, max int) string {
+	if s == "" {
+		return ""
+	}
+	if i := strings.IndexAny(s, "\n"); i >= 0 {
+		s = s[:i]
+	}
+	if i := strings.Index(s, ". "); i >= 0 {
+		s = s[:i+1]
+	}
+	s = strings.TrimSpace(s)
+	if len(s) > max {
+		s = strings.TrimSpace(s[:max]) + "…"
+	}
+	return s
+}
+
+// ── Code emission ────────────────────────────────────────────────────────────
+
+func emit(spells []genSpell) []byte {
+	var b bytes.Buffer
+	b.WriteString(`// Code generated by cmd/open5e-import. DO NOT EDIT.
+//
+// Source: Open5e SRD spell dump (data/open5e/spells.json), 5e SRD content
+// under CC-BY-4.0 — see NOTICE. Regenerate with:
+//
+//	go run ./cmd/open5e-import fetch spells
+//	go run ./cmd/open5e-import gen spells
+//
+// Effect/CastTime/SaveStat and friends come from a free-text classifier; the
+// hand-authored buildSpellList() overlays this slice and wins on ID collision,
+// so any misclassification here is correctable there rather than in the dump.
+
+package plugin
+
+func buildSRDSpellList() []SpellDefinition {
+	return []SpellDefinition{
+`)
+	for _, s := range spells {
+		b.WriteString("\t\t{")
+		fmt.Fprintf(&b, "ID: %q, Name: %q, Level: %d", s.ID, s.Name, s.Level)
+		if s.School != "" {
+			fmt.Fprintf(&b, ", School: %q", s.School)
+		}
+		b.WriteString(", Classes: []DnDClass{")
+		for i, c := range s.Classes {
+			if i > 0 {
+				b.WriteString(", ")
+			}
+			b.WriteString(c)
+		}
+		b.WriteString("}")
+		fmt.Fprintf(&b, ", Effect: %s, CastTime: %s", s.Effect, s.CastTime)
+		if s.Concentration {
+			b.WriteString(", Concentration: true")
+		}
+		if s.SaveStat != "" {
+			fmt.Fprintf(&b, ", SaveStat: %q", s.SaveStat)
+		}
+		if s.AttackRoll {
+			b.WriteString(", AttackRoll: true")
+		}
+		if s.DamageDice != "" {
+			fmt.Fprintf(&b, ", DamageDice: %q", s.DamageDice)
+		}
+		if s.DamageType != "" {
+			fmt.Fprintf(&b, ", DamageType: %q", s.DamageType)
+		}
+		if s.Description != "" {
+			fmt.Fprintf(&b, ", Description: %q", s.Description)
+		}
+		if s.Upcast != "" {
+			fmt.Fprintf(&b, ", Upcast: %q", s.Upcast)
+		}
+		if s.MaterialCost != 0 {
+			fmt.Fprintf(&b, ", MaterialCost: %d", s.MaterialCost)
+		}
+		if s.AOE {
+			b.WriteString(", AOE: true")
+		}
+		b.WriteString("},\n")
+	}
+	b.WriteString("\t}\n}\n")
+	return b.Bytes()
+}

cmd/open5e-import/magicitems.go

@@ -0,0 +1,313 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+)
+
+// open5eMagicItem is the subset of the Open5e v1 magicitems schema we consume.
+// The vendored JSON keeps the full payload; unknown fields are ignored here.
+type open5eMagicItem struct {
+	Slug               string `json:"slug"`
+	Name               string `json:"name"`
+	Type               string `json:"type"`
+	Desc               string `json:"desc"`
+	Rarity             string `json:"rarity"`
+	RequiresAttunement string `json:"requires_attunement"`
+}
+
+type magicItemsPage struct {
+	Next    string            `json:"next"`
+	Results []open5eMagicItem `json:"results"`
+}
+
+// fetchMagicItems pages through the SRD magic-item list and writes the full
+// result set to data/open5e/magicitems.json, pretty-printed for a reviewable
+// diff.
+func fetchMagicItems() error {
+	client := &http.Client{Timeout: 30 * time.Second}
+	var all []open5eMagicItem
+	url := magicItemsAPIBase
+	for url != "" {
+		fmt.Fprintln(os.Stderr, "GET", url)
+		page, err := getMagicItemsPage(client, url)
+		if err != nil {
+			return err
+		}
+		all = append(all, page.Results...)
+		url = page.Next
+	}
+	fmt.Fprintf(os.Stderr, "fetched %d magic items\n", len(all))
+
+	if err := os.MkdirAll(filepath.Dir(magicItemsJSON), 0o755); err != nil {
+		return err
+	}
+	out, err := json.MarshalIndent(all, "", "  ")
+	if err != nil {
+		return err
+	}
+	out = append(out, '\n')
+	return os.WriteFile(magicItemsJSON, out, 0o644)
+}
+
+func getMagicItemsPage(client *http.Client, url string) (*magicItemsPage, error) {
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("%s: HTTP %d", url, resp.StatusCode)
+	}
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	var page magicItemsPage
+	if err := json.Unmarshal(body, &page); err != nil {
+		return nil, err
+	}
+	return &page, nil
+}
+
+// ── Classifier ───────────────────────────────────────────────────────────────
+
+// genMagicItem is a fully classified magic item ready for code emission. Fields
+// mirror plugin.MagicItem; enum-typed fields hold the Go identifier as a string.
+type genMagicItem struct {
+	ID         string
+	Name       string
+	Kind       string // plugin.MagicItemKind identifier
+	Rarity     string // plugin.DnDRarity identifier
+	Attunement bool
+	Slot       string // plugin.DnDSlot identifier; "" = not equippable / ambiguous
+	Value      int
+	Desc       string
+}
+
+// rarityEnum maps an Open5e rarity string to the plugin's DnDRarity identifier.
+// "artifact" folds into Legendary (the plugin has no artifact tier); "varies"
+// and unknown/blank values fall back to Common — the conservative bucket.
+var rarityEnum = map[string]string{
+	"common":    "RarityCommon",
+	"uncommon":  "RarityUncommon",
+	"rare":      "RarityRare",
+	"very rare": "RarityVeryRare",
+	"legendary": "RarityLegendary",
+	"artifact":  "RarityLegendary",
+}
+
+// rarityValue is the sell-value midpoint per rarity, aligned with the §8.1
+// rarity brackets the zone-loot tables already use. Keyed by the Open5e rarity
+// string so the classifier can read it directly.
+var rarityValue = map[string]int{
+	"common":    50,
+	"uncommon":  150,
+	"rare":      750,
+	"very rare": 2500,
+	"legendary": 8000,
+	"artifact":  8000,
+}
+
+// kindByPrefix maps the leading word of Open5e's free-text Type field
+// ("Wondrous item", "Weapon (any sword)", "Armor (medium or heavy)") to a
+// plugin.MagicItemKind identifier.
+var kindByPrefix = map[string]string{
+	"wondrous": "MagicItemWondrous",
+	"weapon":   "MagicItemWeapon",
+	"armor":    "MagicItemArmor",
+	"ring":     "MagicItemRing",
+	"wand":     "MagicItemWand",
+	"rod":      "MagicItemRod",
+	"staff":    "MagicItemStaff",
+	"potion":   "MagicItemPotion",
+	"scroll":   "MagicItemScroll",
+}
+
+// genMagicItems reads the vendored magicitems.json, classifies every SRD magic
+// item, and writes the generated Go data file.
+func genMagicItems() error {
+	raw, err := os.ReadFile(magicItemsJSON)
+	if err != nil {
+		return fmt.Errorf("read %s (run `fetch magicitems` first?): %w", magicItemsJSON, err)
+	}
+	var src []open5eMagicItem
+	if err := json.Unmarshal(raw, &src); err != nil {
+		return err
+	}
+
+	items := make([]genMagicItem, 0, len(src))
+	var attunement, slotted int
+	for _, m := range src {
+		g := classifyMagicItem(m)
+		if g.Attunement {
+			attunement++
+		}
+		if g.Slot != "" {
+			slotted++
+		}
+		items = append(items, g)
+	}
+	sort.Slice(items, func(i, j int) bool { return items[i].ID < items[j].ID })
+	fmt.Fprintf(os.Stderr, "classified %d magic items (%d need attunement, %d slotted)\n",
+		len(items), attunement, slotted)
+
+	out := emitMagicItems(items)
+	if err := os.WriteFile(magicItemsGenGo, out, 0o644); err != nil {
+		return err
+	}
+	fmt.Fprintln(os.Stderr, "wrote", magicItemsGenGo)
+	return nil
+}
+
+func classifyMagicItem(m open5eMagicItem) genMagicItem {
+	g := genMagicItem{
+		ID:         strings.ReplaceAll(m.Slug, "-", "_"),
+		Name:       stripNameParenthetical(m.Name),
+		Attunement: strings.TrimSpace(m.RequiresAttunement) != "",
+		Desc:       magicItemDescription(strings.ReplaceAll(m.Slug, "-", "_"), strings.TrimSpace(m.Desc)),
+	}
+
+	rarity := strings.ToLower(strings.TrimSpace(m.Rarity))
+	if enum, ok := rarityEnum[rarity]; ok {
+		g.Rarity = enum
+	} else {
+		g.Rarity = "RarityCommon"
+	}
+	if v, ok := rarityValue[rarity]; ok {
+		g.Value = v
+	} else {
+		g.Value = rarityValue["common"]
+	}
+
+	// Kind: first word of the Type field. Anything unrecognised (the SRD has a
+	// handful of bare or oddly-prefixed entries) falls back to Wondrous.
+	kindWord := ""
+	if fields := strings.Fields(strings.ToLower(m.Type)); len(fields) > 0 {
+		kindWord = fields[0]
+	}
+	if enum, ok := kindByPrefix[kindWord]; ok {
+		g.Kind = enum
+	} else {
+		g.Kind = "MagicItemWondrous"
+	}
+
+	g.Slot = inferSlot(g.Kind, m.Name)
+	return g
+}
+
+// inferSlot makes a best-effort guess at the equip slot. Weapons/staves go to
+// the main hand, wands/rods to the off hand, armor to the chest, rings to a
+// ring slot. Wondrous items are name-sniffed (cloak, boots, amulet, …) and
+// left blank when nothing matches. Potions and scrolls are consumables and
+// never carry a slot.
+func inferSlot(kind, name string) string {
+	switch kind {
+	case "MagicItemWeapon", "MagicItemStaff":
+		return "DnDSlotMainHand"
+	case "MagicItemWand", "MagicItemRod":
+		return "DnDSlotOffHand"
+	case "MagicItemArmor":
+		return "DnDSlotChest"
+	case "MagicItemRing":
+		return "DnDSlotRing1"
+	case "MagicItemPotion", "MagicItemScroll":
+		return ""
+	}
+	// Wondrous item: sniff the name for a wearable noun.
+	//
+	// Match on word *prefix*, not raw substring — naive Contains() lights up
+	// "ring" inside "Springing" / "Snaring" / "Devouring" and dumps boots,
+	// gloves, and bags into the ring slot.
+	low := strings.ToLower(name)
+	tokens := strings.FieldsFunc(low, func(r rune) bool {
+		return !(r >= 'a' && r <= 'z')
+	})
+	for _, m := range []struct {
+		kw   string
+		slot string
+	}{
+		{"amulet", "DnDSlotAmulet"}, {"necklace", "DnDSlotAmulet"},
+		{"medallion", "DnDSlotAmulet"}, {"periapt", "DnDSlotAmulet"},
+		{"brooch", "DnDSlotAmulet"}, {"pendant", "DnDSlotAmulet"},
+		{"talisman", "DnDSlotAmulet"}, {"scarab", "DnDSlotAmulet"},
+		{"ring", "DnDSlotRing1"},
+		// Cloaks/capes/mantles get their own slot so they don't evict body
+		// armor. Robes/vestments are body armor and stay on Chest.
+		{"cloak", "DnDSlotCloak"}, {"cape", "DnDSlotCloak"},
+		{"mantle", "DnDSlotCloak"}, {"wings", "DnDSlotCloak"},
+		{"robe", "DnDSlotChest"}, {"vestments", "DnDSlotChest"},
+		{"armor", "DnDSlotChest"},
+		{"boots", "DnDSlotFeet"}, {"slippers", "DnDSlotFeet"},
+		{"gauntlet", "DnDSlotHands"}, {"gauntlets", "DnDSlotHands"},
+		{"gloves", "DnDSlotHands"}, {"bracers", "DnDSlotHands"},
+		{"helm", "DnDSlotHead"}, {"hat", "DnDSlotHead"},
+		{"crown", "DnDSlotHead"}, {"circlet", "DnDSlotHead"},
+		{"goggles", "DnDSlotHead"}, {"eyes", "DnDSlotHead"},
+		{"headband", "DnDSlotHead"},
+	} {
+		for _, t := range tokens {
+			if strings.HasPrefix(t, m.kw) {
+				return m.slot
+			}
+		}
+	}
+	return ""
+}
+
+// magicItemDescription returns the Desc text emitted for an item. Override
+// wins; otherwise the SRD first-sentence runs through cleanDesc.
+func magicItemDescription(id, raw string) string {
+	if s, ok := magicItemDescOverride[id]; ok {
+		return s
+	}
+	return firstSentence(cleanDesc(raw), 200)
+}
+
+// ── Code emission ────────────────────────────────────────────────────────────
+
+func emitMagicItems(items []genMagicItem) []byte {
+	var b bytes.Buffer
+	b.WriteString(`// Code generated by cmd/open5e-import. DO NOT EDIT.
+//
+// Source: Open5e SRD magic-item dump (data/open5e/magicitems.json), 5e SRD
+// content under CC-BY-4.0 — see NOTICE. Regenerate with:
+//
+//	go run ./cmd/open5e-import fetch magicitems
+//	go run ./cmd/open5e-import gen magicitems
+//
+// Kind/Rarity/Slot/Value come from a free-text classifier; the hand-authored
+// magicItemOverlay overlays this slice and wins on ID collision, so any
+// misclassification here is correctable there rather than in the dump.
+
+package plugin
+
+func buildSRDMagicItems() []MagicItem {
+	return []MagicItem{
+`)
+	for _, m := range items {
+		b.WriteString("\t\t{")
+		fmt.Fprintf(&b, "ID: %q, Name: %q, Kind: %s, Rarity: %s", m.ID, m.Name, m.Kind, m.Rarity)
+		if m.Attunement {
+			b.WriteString(", Attunement: true")
+		}
+		if m.Slot != "" {
+			fmt.Fprintf(&b, ", Slot: %s", m.Slot)
+		}
+		fmt.Fprintf(&b, ", Value: %d", m.Value)
+		if m.Desc != "" {
+			fmt.Fprintf(&b, ", Desc: %q", m.Desc)
+		}
+		b.WriteString("},\n")
+	}
+	b.WriteString("\t}\n}\n")
+	return b.Bytes()
+}

cmd/open5e-import/main.go

@@ -0,0 +1,162 @@
+// Command open5e-import vendors Open5e SRD data (CC-BY-4.0) into the repo and
+// regenerates the Go data files the plugin compiles against.
+//
+// It is a pull-once / use-many tool — the generated files are committed, so
+// the running bot has no runtime dependency on the Open5e API.
+//
+//	open5e-import fetch spells     # vendor data/open5e/spells.json from the API
+//	open5e-import gen spells       # classify → internal/plugin/dnd_spells_srd_data.go
+//	open5e-import fetch bestiary   # vendor data/open5e/monsters.json from the API
+//	open5e-import gen bestiary     # classify → internal/plugin/bestiary_srd_data.go
+//	open5e-import gen tuned        # tuning formula → internal/plugin/bestiary_tuned_data.go
+//	open5e-import fetch magicitems # vendor data/open5e/magicitems.json from the API
+//	open5e-import gen magicitems   # classify → internal/plugin/magic_items_srd_data.go
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"time"
+)
+
+const (
+	spellsAPIBase = "https://api.open5e.com/v1/spells/?document__slug=wotc-srd&limit=50"
+	spellsJSON    = "data/open5e/spells.json"
+	spellsGenGo   = "internal/plugin/dnd_spells_srd_data.go"
+
+	monstersAPIBase = "https://api.open5e.com/v1/monsters/?document__slug=wotc-srd&limit=50"
+	monstersJSON    = "data/open5e/monsters.json"
+	bestiaryGenGo   = "internal/plugin/bestiary_srd_data.go"
+	tunedGenGo      = "internal/plugin/bestiary_tuned_data.go"
+
+	magicItemsAPIBase = "https://api.open5e.com/v1/magicitems/?document__slug=wotc-srd&limit=50"
+	magicItemsJSON    = "data/open5e/magicitems.json"
+	magicItemsGenGo   = "internal/plugin/magic_items_srd_data.go"
+)
+
+func main() {
+	if len(os.Args) < 3 {
+		usage()
+	}
+	verb, noun := os.Args[1], os.Args[2]
+	switch verb {
+	case "fetch":
+		switch noun {
+		case "spells":
+			must(fetchSpells())
+		case "bestiary":
+			must(fetchMonsters())
+		case "magicitems":
+			must(fetchMagicItems())
+		default:
+			usage()
+		}
+	case "gen":
+		switch noun {
+		case "spells":
+			must(genSpells())
+		case "bestiary":
+			must(genBestiary())
+		case "tuned":
+			must(genTuned())
+		case "magicitems":
+			must(genMagicItems())
+		default:
+			usage()
+		}
+	default:
+		usage()
+	}
+}
+
+func usage() {
+	fmt.Fprintln(os.Stderr, "usage: open5e-import fetch (spells|bestiary|magicitems) | gen (spells|bestiary|tuned|magicitems)")
+	os.Exit(2)
+}
+
+func must(err error) {
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "error:", err)
+		os.Exit(1)
+	}
+}
+
+// open5eSpell is the subset of the Open5e v1 spell schema we consume. Unknown
+// fields are ignored; the vendored JSON keeps the full payload.
+type open5eSpell struct {
+	Slug                  string   `json:"slug"`
+	Name                  string   `json:"name"`
+	Desc                  string   `json:"desc"`
+	HigherLevel           string   `json:"higher_level"`
+	Range                 string   `json:"range"`
+	Material              string   `json:"material"`
+	CanBeCastAsRitual     bool     `json:"can_be_cast_as_ritual"`
+	Duration              string   `json:"duration"`
+	RequiresConcentration bool     `json:"requires_concentration"`
+	CastingTime           string   `json:"casting_time"`
+	LevelInt              int      `json:"level_int"`
+	School                string   `json:"school"`
+	// SpellLists is the structured class list, but the SRD dump leaves it
+	// incomplete (no paladin entries at all). DndClass is the free-text
+	// "Druid, Wizard" field and is the more complete source — mapClasses
+	// unions both. Keep both fields vendored.
+	SpellLists []string `json:"spell_lists"`
+	DndClass   string   `json:"dnd_class"`
+}
+
+type spellsPage struct {
+	Next    string        `json:"next"`
+	Results []open5eSpell `json:"results"`
+}
+
+// fetchSpells pages through the SRD spell list and writes the full result set
+// to data/open5e/spells.json, pretty-printed for a reviewable diff.
+func fetchSpells() error {
+	client := &http.Client{Timeout: 30 * time.Second}
+	var all []open5eSpell
+	url := spellsAPIBase
+	for url != "" {
+		fmt.Fprintln(os.Stderr, "GET", url)
+		page, err := getSpellsPage(client, url)
+		if err != nil {
+			return err
+		}
+		all = append(all, page.Results...)
+		url = page.Next
+	}
+	fmt.Fprintf(os.Stderr, "fetched %d spells\n", len(all))
+
+	if err := os.MkdirAll(filepath.Dir(spellsJSON), 0o755); err != nil {
+		return err
+	}
+	out, err := json.MarshalIndent(all, "", "  ")
+	if err != nil {
+		return err
+	}
+	out = append(out, '\n')
+	return os.WriteFile(spellsJSON, out, 0o644)
+}
+
+func getSpellsPage(client *http.Client, url string) (*spellsPage, error) {
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("%s: HTTP %d", url, resp.StatusCode)
+	}
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	var page spellsPage
+	if err := json.Unmarshal(body, &page); err != nil {
+		return nil, err
+	}
+	return &page, nil
+}

cmd/open5e-import/tuned.go

@@ -0,0 +1,374 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"math"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+// genTuned derives an engine-ready DnDMonsterTemplate for every SRD monster and
+// writes the generated Go data file. It is the codified "tuning pass": the raw
+// SRD staging table one-shots gogobee's solo player, so this applies a
+// deterministic formula to scale each stat block down to the engine's
+// gameplay-tuned shape.
+//
+// Formula (reverse-engineered from the hand-tuned dndBestiary, 2026-05 passes):
+//
+//   - HP, AC, AttackBonus  — verbatim SRD (AC clamped to the engine's min 10).
+//   - Attack               — the auto-resolve damage stat, driven by CR alone
+//     via attackByCR (raw SRD per-hit damage is deliberately ignored — CR is
+//     the calibration axis the 2026-05-10 rebalance used).
+//   - Speed, BlockRate     — coarse baselines from SpeedWalk / AC; a later hand
+//     pass refines them per creature.
+//   - XP, CR               — verbatim from the staging table.
+//   - Ability              — classified from the SRD trait names by
+//     abilityFromTraits: the highest-priority recognised trait maps onto one of
+//     the engine's MonsterAbility effects. Creatures whose traits are all
+//     non-combat (Keen Smell, Amphibious, …) stay nil. Notes still records the
+//     raw SRD multiattack/trait text so a hand pass can refine the pick.
+//
+// Hand-authored dndBestiary entries WIN: the generated map is merged in only
+// for IDs the roster doesn't already define (see bestiary_tuned.go).
+func genTuned() error {
+	raw, err := os.ReadFile(monstersJSON)
+	if err != nil {
+		return fmt.Errorf("read %s (run `fetch bestiary` first?): %w", monstersJSON, err)
+	}
+	var src []open5eMonster
+	if err := json.Unmarshal(raw, &src); err != nil {
+		return err
+	}
+
+	tuned := make([]genTunedMonster, 0, len(src))
+	for _, m := range src {
+		tuned = append(tuned, tuneMonster(classifyMonster(m)))
+	}
+	sort.Slice(tuned, func(i, j int) bool {
+		if tuned[i].CR != tuned[j].CR {
+			return tuned[i].CR < tuned[j].CR
+		}
+		return tuned[i].ID < tuned[j].ID
+	})
+	fmt.Fprintf(os.Stderr, "tuned %d monsters\n", len(tuned))
+
+	out := emitTuned(tuned)
+	if err := os.WriteFile(tunedGenGo, out, 0o644); err != nil {
+		return err
+	}
+	fmt.Fprintln(os.Stderr, "wrote", tunedGenGo)
+	return nil
+}
+
+// genTunedMonster mirrors plugin.DnDMonsterTemplate. Ability is nil when none
+// of the creature's SRD traits map onto an engine effect.
+type genTunedMonster struct {
+	ID, Name     string
+	CR           float64
+	HP, AC       int
+	Attack       int
+	AttackBonus  int
+	Speed        int
+	BlockRate    float64
+	XPValue      int
+	Ability      *genMonsterAbility
+	Notes        string
+	FireAttacker bool
+}
+
+// genMonsterAbility mirrors plugin.MonsterAbility.
+type genMonsterAbility struct {
+	Name       string
+	Phase      string
+	ProcChance float64
+	Effect     string
+}
+
+// tuneMonster applies the tuning formula to one raw SRD stat block.
+func tuneMonster(b genStatBlock) genTunedMonster {
+	ac := b.AC
+	if ac < 10 { // engine minimum (see the zombie 8→10 note in dnd_bestiary.go)
+		ac = 10
+	}
+	ability := abilityFromTraits(b.Traits)
+	return genTunedMonster{
+		ID:           b.Slug,
+		Name:         stripNameParenthetical(b.Name),
+		CR:           b.CR,
+		HP:           b.HP,
+		AC:           ac,
+		Attack:       attackByCR(b.CR),
+		AttackBonus:  primaryAttackBonus(b.Attacks),
+		Speed:        tunedSpeed(b.SpeedWalk),
+		BlockRate:    tunedBlockRate(ac),
+		XPValue:      b.XP,
+		Ability:      ability,
+		Notes:        tunedNotes(b, ability),
+		FireAttacker: isFireAttacker(b.Attacks),
+	}
+}
+
+// isFireAttacker returns true when a monster's signature damage is fire —
+// i.e., its highest-average-damage attack deals fire. Threshold at AvgDamage
+// >= 5 so a trivial fire fleck on an otherwise physical creature doesn't tag
+// the whole bestiary entry. Tieflings (FireResist) take half damage from the
+// primary attack of any creature flagged here.
+func isFireAttacker(attacks []genStatAttack) bool {
+	bestAvg, bestType := 0, ""
+	for _, a := range attacks {
+		if a.AvgDamage > bestAvg {
+			bestAvg = a.AvgDamage
+			bestType = a.DamageType
+		}
+	}
+	return bestType == "fire" && bestAvg >= 5
+}
+
+// stripNameParenthetical drops a trailing "(…)" qualifier from a monster
+// name so the player-facing display reads "Giant Rat" rather than "Giant Rat
+// (Diseased)". The slug still carries the variant, so the engine keeps both
+// records distinct — only the display text loses the qualifier.
+func stripNameParenthetical(name string) string {
+	i := strings.IndexByte(name, '(')
+	if i <= 0 {
+		return name
+	}
+	return strings.TrimSpace(name[:i])
+}
+
+// traitAbilityRules maps SRD special-ability names onto the engine's
+// MonsterAbility effects. Each rule's Match list holds lowercase substrings; a
+// creature's trait matches a rule if any substring is contained in the
+// (lowercased, paren-stripped) trait name. The list is priority-ordered —
+// abilityFromTraits walks it top-down and the first rule that matches any of
+// the creature's traits wins, so the most combat-defining mechanic is picked
+// when a stat block carries several traits. Traits that name no rule (Keen
+// Smell, Amphibious, Hold Breath, telepathy/senses flavor) leave Ability nil.
+//
+// This is a best-effort baseline, like the rest of the tuning formula: the
+// hand-authored dndBestiary entry always wins the merge, so refining a pick is
+// a matter of adding the creature to the roster.
+var traitAbilityRules = []struct {
+	match  []string
+	name   string
+	phase  string
+	proc   float64
+	effect string
+}{
+	// Death-triggered blasts — resolve on the killing-blow phase.
+	{[]string{"death burst", "death throes", "elemental demise"}, "Death Burst", "decisive", 1.0, "death_aoe"},
+	// Spellcasters open with a magical barrage.
+	{[]string{"spellcasting"}, "Spellcasting", "opening", 0.5, "aoe"},
+	// Cheats death once.
+	{[]string{"undead fortitude"}, "Undead Fortitude", "decisive", 0.5, "survive_at_1"},
+	// Self-sustain — trolls, liches clawing back.
+	{[]string{"regeneration", "rejuvenation"}, "Regeneration", "any", 0.5, "regenerate"},
+	// Shrugs off spells.
+	{[]string{"magic resistance", "legendary resistance", "magic immunity", "spell immunity"}, "Magic Resistance", "any", 0.5, "spell_resist"},
+	// Ambush predators — a heavy opening strike.
+	{[]string{"surprise attack", "assassinate", "ambusher", "shadow stealth"}, "Surprise Attack", "opening", 0.8, "bonus_damage"},
+	// Fear and petrification lock the player out of acting.
+	{[]string{"petrifying gaze", "fear aura", "horrific appearance"}, "Frightful Presence", "opening", 0.4, "stun"},
+	// Frenzy / rage — damage ramps as the fight drags.
+	{[]string{"blood frenzy", "rampage", "reckless", "aggressive", "berserk", "brute"}, "Frenzy", "any", 0.4, "enrage"},
+	// Damaging auras and spiky hides punish every exchange.
+	{[]string{"heated body", "fire aura", "fire form", "stench", "mucous cloud", "barbed hide", "reflective carapace", "heated weapons", "hellish weapons"}, "Damaging Aura", "any", 0.4, "retaliate"},
+	// Charges, pounces, leaps — an opening lunge.
+	{[]string{"charge", "pounce", "standing leap", "running leap"}, "Charge", "opening", 0.4, "bonus_damage"},
+	// Coordinated attackers gain advantage.
+	{[]string{"pack tactics"}, "Pack Tactics", "any", 0.3, "advantage"},
+	// Riders that pile damage onto a landed hit.
+	{[]string{"sneak attack", "martial advantage"}, "Martial Advantage", "any", 0.35, "bonus_damage"},
+	// Slippery movement — dodges a blow outright.
+	{[]string{"nimble escape", "misty escape", "cunning action", "evasion", "incorporeal movement", "ethereal jaunt", "flyby", "shapechanger"}, "Evasive", "any", 0.3, "evade"},
+	// Enchanted weapons — a flat damage edge.
+	{[]string{"magic weapons", "angelic weapons"}, "Magic Weapons", "any", 0.3, "bonus_damage"},
+}
+
+// abilityFromTraits picks the highest-priority MonsterAbility implied by a
+// creature's SRD trait names, or nil when none of them map onto an engine
+// effect. See traitAbilityRules for the priority order.
+func abilityFromTraits(traits []string) *genMonsterAbility {
+	norm := make([]string, len(traits))
+	for i, t := range traits {
+		// Drop the parenthetical suffix SRD appends to recharge-limited
+		// traits ("Legendary Resistance (3/Day)").
+		if p := strings.IndexByte(t, '('); p >= 0 {
+			t = t[:p]
+		}
+		norm[i] = strings.ToLower(strings.TrimSpace(t))
+	}
+	for _, rule := range traitAbilityRules {
+		for _, tr := range norm {
+			for _, m := range rule.match {
+				if strings.Contains(tr, m) {
+					return &genMonsterAbility{
+						Name:       rule.name,
+						Phase:      rule.phase,
+						ProcChance: rule.proc,
+						Effect:     rule.effect,
+					}
+				}
+			}
+		}
+	}
+	return nil
+}
+
+// attackByCRPoints anchors the Attack-stat curve against the hand-tuned
+// dndBestiary: each point is an (CR, observed Attack) pair lifted straight from
+// a playtested roster entry. attackByCR interpolates between anchors and
+// extrapolates past the top one along the final segment's slope.
+var attackByCRPoints = []struct {
+	cr  float64
+	atk int
+}{
+	{0, 1}, {0.125, 1}, {0.25, 1}, {0.5, 2}, {1, 2}, {2, 4}, {3, 6}, {4, 7},
+	{5, 8}, {6, 10}, {7, 12}, {8, 13}, {9, 14}, {10, 16}, {11, 18}, {12, 19},
+	{13, 21}, {16, 26}, {19, 31}, {20, 33}, {24, 38},
+}
+
+func attackByCR(cr float64) int {
+	pts := attackByCRPoints
+	if cr <= pts[0].cr {
+		return pts[0].atk
+	}
+	last := pts[len(pts)-1]
+	if cr >= last.cr {
+		prev := pts[len(pts)-2]
+		slope := float64(last.atk-prev.atk) / (last.cr - prev.cr)
+		atk := int(math.Round(float64(last.atk) + slope*(cr-last.cr)))
+		if atk < 1 {
+			atk = 1
+		}
+		return atk
+	}
+	for i := 1; i < len(pts); i++ {
+		if cr <= pts[i].cr {
+			lo, hi := pts[i-1], pts[i]
+			t := (cr - lo.cr) / (hi.cr - lo.cr)
+			atk := int(math.Round(float64(lo.atk) + t*float64(hi.atk-lo.atk)))
+			if atk < 1 {
+				atk = 1
+			}
+			return atk
+		}
+	}
+	return last.atk
+}
+
+// primaryAttackBonus returns the d20 to-hit modifier of the creature's
+// hardest-hitting attack — the one the engine's single Attack stat stands in
+// for. Returns 0 (engine falls back to the tier-scaled bonus) when the stat
+// block has no parsed weapon attacks.
+func primaryAttackBonus(attacks []genStatAttack) int {
+	bonus, best := 0, -1
+	for _, a := range attacks {
+		if a.AvgDamage > best {
+			best, bonus = a.AvgDamage, a.AttackBonus
+		}
+	}
+	return bonus
+}
+
+// tunedSpeed maps an SRD walk speed (feet) onto the engine's speed scale. The
+// engine treats speed as an initiative-ordering knob, so a coarse divide-and-
+// clamp is enough; the ability pass can hand-tune outliers.
+func tunedSpeed(walk int) int {
+	if walk <= 0 {
+		return 10
+	}
+	s := int(math.Round(float64(walk) / 2.5))
+	if s < 6 {
+		s = 6
+	}
+	if s > 18 {
+		s = 18
+	}
+	return s
+}
+
+// tunedBlockRate is a baseline damage-halve chance keyed off AC — heavier armor
+// reads as a better chance to soak a hit. The ability pass overrides this for
+// creatures whose block is a real mechanic (Parry, shields, etc.).
+func tunedBlockRate(ac int) float64 {
+	switch {
+	case ac >= 18:
+		return 0.15
+	case ac >= 15:
+		return 0.10
+	case ac >= 13:
+		return 0.05
+	default:
+		return 0.0
+	}
+}
+
+// tunedNotes records the SRD multiattack and trait text so a hand-tuning pass
+// has the source material in front of it, and states which ability (if any)
+// the trait classifier wired.
+func tunedNotes(b genStatBlock, ability *genMonsterAbility) string {
+	prefix := "SRD-tuned baseline — no ability wired (traits are non-combat)."
+	if ability != nil {
+		prefix = fmt.Sprintf("SRD-tuned baseline — %s (%s) wired from traits.",
+			ability.Name, ability.Effect)
+	}
+	var parts []string
+	if b.Multiattack != "" {
+		parts = append(parts, "Multiattack: "+b.Multiattack)
+	}
+	if len(b.Traits) > 0 {
+		parts = append(parts, "Traits: "+strings.Join(b.Traits, ", "))
+	}
+	if len(parts) == 0 {
+		return prefix
+	}
+	return prefix + " " + strings.Join(parts, " ")
+}
+
+// emitTuned renders the tuned templates as a generated Go source file.
+func emitTuned(monsters []genTunedMonster) []byte {
+	var b bytes.Buffer
+	b.WriteString(`// Code generated by cmd/open5e-import. DO NOT EDIT.
+//
+// Source: Open5e SRD monster dump (data/open5e/monsters.json), 5e SRD content
+// under CC-BY-4.0 — see NOTICE. Regenerate with:
+//
+//	go run ./cmd/open5e-import fetch bestiary
+//	go run ./cmd/open5e-import gen tuned
+//
+// Engine-ready DnDMonsterTemplates derived from the raw SRD staging table by
+// the tuning formula in cmd/open5e-import/tuned.go. Hand-authored dndBestiary
+// entries take precedence — see bestiary_tuned.go for the merge.
+
+package plugin
+
+func buildTunedBestiarySRD() map[string]DnDMonsterTemplate {
+	return map[string]DnDMonsterTemplate{
+`)
+	for _, m := range monsters {
+		fmt.Fprintf(&b, "\t\t%q: {ID: %q, Name: %q, CR: %s, HP: %d, AC: %d, Attack: %d, AttackBonus: %d, Speed: %d, BlockRate: %s, XPValue: %d, ",
+			m.ID, m.ID, m.Name,
+			strconv.FormatFloat(m.CR, 'g', -1, 32),
+			m.HP, m.AC, m.Attack, m.AttackBonus, m.Speed,
+			strconv.FormatFloat(m.BlockRate, 'g', -1, 64),
+			m.XPValue)
+		if m.Ability != nil {
+			fmt.Fprintf(&b, "Ability: &MonsterAbility{Name: %q, Phase: %q, ProcChance: %s, Effect: %q}, ",
+				m.Ability.Name, m.Ability.Phase,
+				strconv.FormatFloat(m.Ability.ProcChance, 'g', -1, 64),
+				m.Ability.Effect)
+		}
+		fmt.Fprintf(&b, "Notes: %q", m.Notes)
+		if m.FireAttacker {
+			b.WriteString(", FireAttacker: true")
+		}
+		b.WriteString("},\n")
+	}
+	b.WriteString("\t}\n}\n")
+	return b.Bytes()
+}

fix-holdem-tips.md

@@ -1,319 +0,0 @@
-# Fix: Texas Hold'em LLM Tips
-
-## What's broken
-
-Two confirmed issues observed across multiple tip examples:
-
-### 1. Position label is inverted in heads-up play
-
-The tip says "positional advantage" when the player is acting first post-flop (out of position) and "out of position" when they're acting last. The position label reaching the LLM prompt is wrong.
-
-**Root cause:** the `positionLabel()` function in `tips.go` derives position from `DealerIdx` using the general formula. In heads-up play the dealer posts the small blind and acts first pre-flop but **last** post-flop. The heads-up exception that exists in `PostBlinds()` in `betting.go` is not being reflected in position label calculation.
-
-**Fix:** in `positionLabel()`, gate on `len(g.Players) == 2` before applying any label logic. In heads-up:
-- Pre-flop: dealer = BTN/SB (acts first), other player = BB (acts last)
-- Post-flop: dealer = BTN (acts last, positional advantage), other player = BB (acts first, out of position)
-
-Check which street it is before assigning the label. `g.Street == PreFlop` needs different position semantics than all other streets in heads-up.
-
----
-
-### 2. LLM is generating generic concepts instead of hand-specific advice
-
-**Observed:** tips reference equity numbers but then ignore what those numbers mean for the specific hand. A player with 8♥ 7♥ on Q♥ K♠ 10♦ (gutshot + backdoor flush draw, 29% equity, free card available) received "not enough equity to bet" — which ignores the draw entirely and misapplies a made-hand concept to a drawing hand.
-
-**Root cause:** the user prompt is not giving the LLM enough structured context to reason about hand *type*. It sees an equity number but doesn't know whether the hand is a draw, a made hand, a bluff catcher, or air. It pattern-matches on the number alone.
-
-**Fix:** compute and inject the following additional fields into `TipContext` before building the prompt:
-
-```go
-type TipContext struct {
-    // existing fields...
-
-    // Add these:
-    HandCategory    string   // from poker.RankString() on current 5-card best
-    IsDraw          bool     // true if outs > 0 (see below)
-    FlushDrawOuts   int      // suited cards matching board suit count
-    StraightDrawOuts int     // connected card gaps to straight
-    TotalOuts       int      // combined draw outs (deduped)
-    IsFreeCard      bool     // ToCall == 0
-    HeadsUp         bool     // len(ActivePlayers) == 2
-}
-```
-
-Outs calculation (add to `equity.go` or a new `outs.go`):
-- Flush draw: count hole cards matching dominant board suit; if 2 hole cards + 2 board cards same suit, FlushDrawOuts = 9
-- Open-ended straight draw: 8 outs
-- Gutshot: 4 outs
-- Backdoor draws: count as 1-2 outs each
-- TotalOuts = sum, capped at 15 (avoid double-counting straights and flushes)
-
----
-
-### 3. System prompt needs to be more directive
-
-**Current system prompt** (paraphrased from blueprint): "be a concise Hold'em coach, 2-4 sentences, cover hand strength, pot odds, position."
-
-This is too open-ended. The LLM fills the space with whatever poker concepts come to mind. Replace with a prompt that forces it to reason about the specific situation before speaking.
-
-**New system prompt:**
-
-```
-You are a Texas Hold'em coach giving advice to a single player via private message.
-You will receive structured game context. Reason through it in this order:
-
-1. What type of hand do I have — made hand, drawing hand, or air?
-2. If drawing: how many outs, and do pot odds justify continuing?
-3. If made hand: is it strong enough to bet for value, or weak enough to just pot control?
-4. Does position affect what I should do here?
-5. Is a free card available, and if so, is taking it correct?
-
-Then write ONE piece of advice — 2 to 3 sentences maximum — that tells the player
-what to do and why, using the specific cards and numbers provided.
-Do not list concepts. Do not use generic poker vocabulary without connecting it to
-this specific hand. If the correct play is obvious (e.g. free card with a draw),
-say so plainly and briefly.
-```
-
----
-
-### 4. User prompt needs draw and hand type context injected
-
-**Current user prompt structure** (from blueprint):
-```
-Street: <street>
-Your hand: <cards>
-Board: <cards>
-Equity vs <n> opponents: Win x% | Tie y% | Loss z%
-Pot odds to call: x%
-SPR: x | Position: <pos> | Active players: <n>
-```
-
-**New user prompt structure** — add the computed fields:
-
-```
-Street: {street}
-Your hand: {cards}  [{hand_category}]
-Board: {cards}
-Draw outs: {total_outs} ({draw_description})   <- omit line if IsDraw == false
-Equity vs {n} opponent(s): Win {x}% | Tie {y}% | Loss {z}%
-{if ToCall > 0}: Pot odds to call: {pct}% — equity {exceeds|falls short of} price
-{if IsFreeCard}: Free card available — no bet to call
-SPR: {spr} | Position: {position} | Heads-up: {yes|no} | Street: {street}
-```
-
-`{draw_description}` examples:
-- "flush draw (9 outs)"
-- "gutshot straight draw (4 outs)"
-- "open-ended straight draw (8 outs)"
-- "flush draw + gutshot (11 outs)"
-- "backdoor flush + backdoor straight (2 outs)"
-
-`{hand_category}` examples from `poker.RankString()`:
-- "High Card", "One Pair", "Two Pair", "Three of a Kind", "Straight", "Flush", "Full House", "Four of a Kind", "Straight Flush"
-
----
-
-## Specific scenario the fix must handle correctly
-
-**Hand:** 8♥ 7♥
-**Board:** Q♥ K♠ 10♦
-**Street:** Flop
-**Equity:** 29%
-**To call:** €0 (free card)
-**Position:** dealer, heads-up, acting first post-flop (out of position)
-
-Expected tip behaviour after fix:
-- Identifies this as a drawing hand (gutshot + backdoor flush)
-- Notes the free card is available
-- Does NOT say "not enough equity to bet" without acknowledging the draw
-- Does NOT say "positional advantage" — player is out of position post-flop heads-up
-- Produces something like: "You have a gutshot straight draw with a backdoor flush. With a free card available you can check and see the turn without risk. If a 9 or a third heart comes, you'll be in a strong position — for now, take the free card."
-
----
-
-## Reasoning mode (Qwen3 thinking)
-
-Poker tips are the only task in GogoBee that should use reasoning mode. All other LLM calls (adventure narrative, etc.) run with thinking disabled. This needs to be a one-off configuration scoped entirely to `tips.go`.
-
-### Why reasoning mode here
-
-The tips failure pattern is not a knowledge gap — Qwen3-32B knows poker. The problem is that it jumps to pattern-matched conclusions without working through the situation in sequence. Reasoning mode forces the model to produce a `<think>...</think>` chain before the final response, which naturally surfaces: hand type, outs, position semantics, and the actual decision. The tip then follows from that chain rather than being assembled from disconnected concepts.
-
-### Request changes in `tips.go`
-
-Add a `enable_thinking` field to the request body and a `thinking_budget` cap to keep latency bounded:
-
-```go
-type llmRequest struct {
-    Model          string       `json:"model"`
-    Messages       []llmMessage `json:"messages"`
-    MaxTokens      int          `json:"max_tokens"`
-    Stream         bool         `json:"stream"`
-    EnableThinking bool         `json:"enable_thinking,omitempty"`
-    ThinkingBudget int          `json:"thinking_budget,omitempty"`
-}
-```
-
-When building the tips request, set:
-
-```go
-body := llmRequest{
-    Model:          cfg.Model,
-    Messages:       []llmMessage{...},
-    MaxTokens:      1000,   // increased to accommodate think block + response
-    Stream:         false,
-    EnableThinking: true,
-    ThinkingBudget: 512,    // cap reasoning tokens; enough for poker, not runaway
-}
-```
-
-`ThinkingBudget` of 512 tokens is sufficient for a poker hand analysis reasoning chain. Without a cap, complex board textures can produce very long think blocks. 512 keeps worst-case latency reasonable.
-
-Note: the exact field names for Ollama's Qwen3 thinking mode may differ from the above. Check the Ollama API docs for the current `qwen3:32b` thinking parameters — it may be `/think` appended to the model name (`qwen3:32b/think`) rather than a request body field, depending on the Ollama version. Either way, the intent is the same — make this configurable in `TipsConfig` so it can be toggled without a code change:
-
-```go
-type TipsConfig struct {
-    Endpoint       string
-    Model          string
-    APIKey         string
-    Timeout        time.Duration
-    EnableThinking bool          // default true for poker tips
-    ThinkingBudget int           // default 512
-}
-```
-
-### Strip the think block from the response
-
-The `<think>...</think>` content must never reach the player DM. The current response parser takes `choices[0].message.content` directly. Update it to strip thinking content before returning:
-
-```go
-func extractTipFromResponse(raw string) string {
-    // Strip <think>...</think> block if present
-    // Qwen3 may use <think> or <!--think--> depending on version
-    re := regexp.MustCompile(`(?s)<think>.*?</think>`)
-    cleaned := re.ReplaceAllString(raw, "")
-
-    // Also strip any leading/trailing whitespace left behind
-    return strings.TrimSpace(cleaned)
-}
-```
-
-Call `extractTipFromResponse()` on `llmResp.Choices[0].Message.Content` before returning the tip string. If the result is empty after stripping (model only produced a think block and nothing else), fall back to the rules-based tip.
-
-### Latency expectations
-
-With `ThinkingBudget: 512` and the structured context prompt, expect:
-- Typical: 4-8 seconds total (within the existing 10s timeout)
-- Complex boards: up to 10 seconds
-- Increase `cfg.Timeout` to `12 * time.Second` for tips specifically to give reasoning room without affecting other LLM calls
-
-Tip delivery via DM is already async (goroutine), so even a 10-12 second tip doesn't block the table view or the action loop. Players receive the table view immediately and the tip follows shortly after.
-
-### Config addition
-
-```toml
-[holdem]
-# ... existing fields ...
-tips_enable_thinking = true
-tips_thinking_budget = 512
-tips_timeout         = "12s"   # longer than default to accommodate reasoning
-```
-
----
-
-## Files to change
-
-- `tips.go` — `TipContext` struct, `BuildTipContext()`, `buildPrompt()`, `positionLabel()`, `llmRequest` struct, `GenerateTip()`, new `extractTipFromResponse()` function
-- `equity.go` — add outs calculation function
-- No schema changes required
-- No changes to `game.go`, `betting.go`, or `render.go`
-
-## Test cases to verify before shipping
-
-Write a table-driven test in `tips_test.go` covering:
-
-| Hand | Board | Street | Expected position (HU) | Expected IsDraw | Expected outs |
-|------|-------|--------|------------------------|-----------------|---------------|
-| 8♥ 7♥ | Q♥ K♠ 10♦ | Flop | Out of position | true | 4 (gutshot) + backdoor |
-| A♠ K♠ | — | Pre-Flop | BTN (dealer, acts first) | false | 0 |
-| 5♥ 6♥ | 7♥ 8♣ 2♥ | Flop | varies | true | 15 (OESD + flush) |
-| Q♣ Q♦ | Q♥ 2♠ 7♣ | Flop | varies | false | 0 |
-
-The position test for heads-up pre-flop vs post-flop is the most important one. Get that right first.
-
----
-
-## Validation pipeline (shipped 2026-04-13)
-
-The "is the tip actually good?" question is now answered by a two-layer
-automated test harness rather than vibes.
-
-**Layer 1 — hand-authored scenarios** (`internal/plugin/holdem_tip_scenarios.go`)
-
-20 canonical spots covering preflop tier/facing-bet branches and postflop
-equity tiers × board textures × SPR depths. Each scenario declares an
-expected action verb, required theme keywords, and forbidden substrings.
-`TestTipScenarios_Layer1` runs the full rules-engine pipeline
-(equity MC, draw detection, hand category, board texture, preflop
-classification) against each scenario and asserts the tip contains the
-expected action + themes. Fast, cheap, green.
-
-**Layer 2 — solver-derived scenarios** (same scenarios, populated via `cmd/gensolver`)
-
-11 of the 14 postflop scenarios carry real TexasSolver GTO frequencies
-committed as a fixture at `internal/plugin/testdata/solver_freqs.json`.
-`TestTipScenarios_Layer2` treats any action with solver frequency ≥ 15% as
-"significant" and asserts the rules engine's recommended action matches one
-of the significant actions — tolerating GTO's legitimately mixed spots
-while catching genuinely-wrong recommendations.
-
-**cmd/gensolver**
-
-Offline pipeline that iterates `plugin.TipScenarios()`, shells out to
-`console_solver` (TexasSolver CLI), parses the JSON strategy tree,
-navigates to hero's decision node (IP/OOP × facing-check/facing-bet ×
-check-bet line), extracts hero's action frequencies for their exact hole
-combo, and merges them into the fixture file.
-
-Key solver-side knobs worked out the hard way:
-
-- **Scale normalization** to `pot=50, stack=8×pot` (SPR cap 8). TexasSolver
-  segfaults on deep stacks and on some textures at larger chip counts;
-  strategic equivalence is preserved because GTO frequencies are
-  scale-invariant.
-- **Bet tree**: 50% + 100% pot sizings, plus allin. Narrower trees build
-  faster and still give solvable decision points.
-- **`set_accuracy 1.0`, `set_max_iteration 100`** — converges in ~2 min
-  per flop instead of the ~24 min the solver's defaults demanded. 1%
-  exploitability is plenty for our assertion type.
-- **Range syntax**: TexasSolver rejects shorthand like `22+` / `A2s+` —
-  ranges must be explicitly enumerated. Using the solver's own
-  sample-input ranges verbatim as HU defaults.
-
-Invocation:
-
-```bash
-GOGOBEE_SOLVER=/path/to/console_solver \
-GOGOBEE_SOLVER_RESOURCES=/path/to/TexasSolver/resources \
-go run ./cmd/gensolver [scenario-name-substring]
-```
-
-Results merge into the fixture, so regenerating one scenario doesn't wipe
-the others.
-
-**Known gaps** — 3 scenarios have no solver frequencies:
-
-- `flop/monster set on paired board facing bet` — TexasSolver segfaults on
-  paired-board textures (upstream bug, not fixable from our side).
-- `turn/weak top pair facing overbet` — hero's hole (63o) isn't in any
-  reasonable HU range, so the solver never allocates strategy for it.
-  Scenario still validated by Layer 1.
-- Occasional flake on `flop/bottom pair facing big bet` at full-batch time
-  (succeeds when retried solo). Current fixture entry came from a solo
-  retry and is valid; if regeneration fails, just re-run that one
-  scenario with the name filter.
-
-Adding new scenarios: append to `tipScenarios` in
-`holdem_tip_scenarios.go`, run `cmd/gensolver` with the name filter,
-commit both the code and fixture changes together.

go.mod

@@ -3,45 +3,45 @@ module gogobee
 go 1.25.0
 
 require (
-	github.com/PuerkitoBio/goquery v1.10.3
+	github.com/PuerkitoBio/goquery v1.12.0
 	github.com/chehsunliu/poker v0.1.0
-	github.com/expr-lang/expr v1.17.5
+	github.com/expr-lang/expr v1.17.8
 	github.com/fogleman/gg v1.3.0
 	github.com/google/uuid v1.6.0
 	github.com/joho/godotenv v1.5.1
 	github.com/olebedev/when v1.1.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	golang.org/x/image v0.36.0
-	maunium.net/go/mautrix v0.26.3
-	modernc.org/sqlite v1.37.1
+	golang.org/x/image v0.40.0
+	maunium.net/go/mautrix v0.28.0
+	modernc.org/sqlite v1.50.1
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
+	filippo.io/edwards25519 v1.2.0 // indirect
 	github.com/AlekSi/pointer v1.0.0 // indirect
 	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-sqlite3 v1.14.34 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/petermattis/goid v0.0.0-20260113132338-7c7de50cc741 // indirect
+	github.com/mattn/go-sqlite3 v1.14.44 // indirect
+	github.com/ncruces/go-strftime v1.0.0 // indirect
+	github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rs/zerolog v1.34.0 // indirect
-	github.com/tidwall/gjson v1.18.0 // indirect
+	github.com/rs/zerolog v1.35.1 // indirect
+	github.com/tidwall/gjson v1.19.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	go.mau.fi/util v0.9.6 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect
-	golang.org/x/net v0.50.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
-	golang.org/x/text v0.34.0 // indirect
-	modernc.org/libc v1.65.7 // indirect
+	go.mau.fi/util v0.9.9 // indirect
+	golang.org/x/crypto v0.51.0 // indirect
+	golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a // indirect
+	golang.org/x/net v0.54.0 // indirect
+	golang.org/x/sys v0.44.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
+	modernc.org/libc v1.72.3 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )

go.sum

@@ -1,26 +1,24 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
+filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
 github.com/AlekSi/pointer v1.0.0 h1:KWCWzsvFxNLcmM5XmiqHsGTTsuwZMsLFwWF9Y+//bNE=
 github.com/AlekSi/pointer v1.0.0/go.mod h1:1kjywbfcPFCmncIxtk6fIEub6LKrfMz3gc5QKVOSOA8=
 github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
-github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
-github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
+github.com/PuerkitoBio/goquery v1.12.0 h1:pAcL4g3WRXekcB9AU/y1mbKez2dbY2AajVhtkO8RIBo=
+github.com/PuerkitoBio/goquery v1.12.0/go.mod h1:802ej+gV2y7bbIhOIoPY5sT183ZW0YFofScC4q/hIpQ=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
 github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
 github.com/chehsunliu/poker v0.1.0 h1:OeB4O+QROhA/DiXUhBBlkgbzCx0ZVWMpWgKNu+PX9vI=
 github.com/chehsunliu/poker v0.1.0/go.mod h1:V6K4yyDbafp0k6lUnYbwoTS/KsHSB1EWiJdEk54uB1w=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/expr-lang/expr v1.17.5 h1:i1WrMvcdLF249nSNlpQZN1S6NXuW9WaOfF5tPi3aw3k=
-github.com/expr-lang/expr v1.17.5/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
+github.com/expr-lang/expr v1.17.8 h1:W1loDTT+0PQf5YteHSTpju2qfUfNoBt4yw9+wOEU9VM=
+github.com/expr-lang/expr v1.17.8/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -28,27 +26,26 @@ github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17k
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/loganjspears/joker v0.0.0-20180219043703-3f2f69a75914 h1:yAIlIiOkdoJvqd5xtWzM9tNDpLZrFfJdpnNSKha78G8=
 github.com/loganjspears/joker v0.0.0-20180219043703-3f2f69a75914/go.mod h1:76SAnflG7ZFhgtnaVCpP6A5Z1S/VMFzRBN7KGm5j4oc=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.34 h1:3NtcvcUnFBPsuRcno8pUtupspG/GM+9nZ88zgJcp6Zk=
-github.com/mattn/go-sqlite3 v1.14.34/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/mattn/go-sqlite3 v1.14.44 h1:3VSe+xafpbzsLbdr2AWlAZk9yRHiBhTBakioXaCKTF8=
+github.com/mattn/go-sqlite3 v1.14.44/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ=
+github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
+github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/notnil/joker v0.0.0-20180219043703-3f2f69a75914 h1:xXPuFr3PVM4p6Vw3j0CP29oWYRVKO3cPZjR6D7BxggQ=
 github.com/notnil/joker v0.0.0-20180219043703-3f2f69a75914/go.mod h1:L0Sdr2nYdktjerdXpIn9wOCn+GebPs/nCL2qH6RTGa0=
 github.com/olebedev/when v1.1.0 h1:dlpoRa7huImhNtEx4yl0WYfTHVEWmJmIWd7fEkTHayc=
 github.com/olebedev/when v1.1.0/go.mod h1:T0THb4kP9D3NNqlvCwIG4GyUioTAzEhB4RNVzig/43E=
-github.com/petermattis/goid v0.0.0-20260113132338-7c7de50cc741 h1:KPpdlQLZcHfTMQRi6bFQ7ogNO0ltFT4PmtwTLW4W+14=
-github.com/petermattis/goid v0.0.0-20260113132338-7c7de50cc741/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 h1:WDsQxOJDy0N1VRAjXLpi8sCEZRSGarLWQevDxpTBRrM=
+github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -57,9 +54,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
-github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
-github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
+github.com/rs/zerolog v1.35.1 h1:m7xQeoiLIiV0BCEY4Hs+j2NG4Gp2o2KPKmhnnLiazKI=
+github.com/rs/zerolog v1.35.1/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -67,8 +63,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
+github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
@@ -77,27 +73,27 @@ github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mau.fi/util v0.9.6 h1:2nsvxm49KhI3wrFltr0+wSUBlnQ4CMtykuELjpIU+ts=
-go.mau.fi/util v0.9.6/go.mod h1:sIJpRH7Iy5Ad1SBuxQoatxtIeErgzxCtjd/2hCMkYMI=
+go.mau.fi/util v0.9.9 h1:ujDeXCo07HBor5oQLyO1tHklupmqVmPgasc53d7q/NE=
+go.mau.fi/util v0.9.9/go.mod h1:pqt4Vcrt+5gcH/CgrHZg11qSx+b34o6mknGzOEA6waY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
-golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a h1:ovFr6Z0MNmU7nH8VaX5xqw+05ST2uO1exVfZPVqRC5o=
-golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
-golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
-golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
+golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
+golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
+golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a h1:+3jdDGGB8NGb1Zktc737jlt3/A5f6UlwSzmvqUuufxw=
+golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
+golang.org/x/image v0.40.0 h1:Tw4GyDXMo+daZN1znreBRC3VayR1aLFUyUEOLUdW1a8=
+golang.org/x/image v0.40.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
+golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -107,8 +103,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
-golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
+golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
+golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -116,14 +112,13 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -131,8 +126,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
+golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -151,43 +146,47 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
-golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
+golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-maunium.net/go/mautrix v0.26.3 h1:tWZih6Vjw0qGTWuPmg9JUrQPzViTNDPGQLVc5UXC4nk=
-maunium.net/go/mautrix v0.26.3/go.mod h1:v5ZdDoCwUpNqEj5OrhEoUa3L1kEddKPaAya9TgGXN38=
-modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s=
-modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU=
-modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE=
-modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
-modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
+maunium.net/go/mautrix v0.28.0 h1:vBakLzf8MAdfED3NzAKiMeKQbc3AQ4EAS03NC+TVMXQ=
+maunium.net/go/mautrix v0.28.0/go.mod h1:/a9A7LGaqb9B3nho4tLd28n0EPcCdwpm2dxkxkLLgh0=
+modernc.org/cc/v4 v4.28.2 h1:3tQ0lf2ADtoby2EtSP+J7IE2SHwEJdP8ioR59wx7XpY=
+modernc.org/cc/v4 v4.28.2/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
+modernc.org/ccgo/v4 v4.34.0 h1:yRLPFZieg532OT4rp4JFNIVcquwalMX26G95WQDqwCQ=
+modernc.org/ccgo/v4 v4.34.0/go.mod h1:AS5WYMyBakQ+fhsHhtP8mWB82KTGPkNNJDGfGQCe0/A=
+modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
+modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/libc v1.65.7 h1:Ia9Z4yzZtWNtUIuiPuQ7Qf7kxYrxP1/jeHZzG8bFu00=
-modernc.org/libc v1.65.7/go.mod h1:011EQibzzio/VX3ygj1qGFt5kMjP0lHb0qCW5/D/pQU=
+modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo=
+modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
+modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
+modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
+modernc.org/libc v1.72.3 h1:ZnDF4tXn4NBXFutMMQC4vtbTFSXhhKzR73fv0beZEAU=
+modernc.org/libc v1.72.3/go.mod h1:dn0dZNnnn1clLyvRxLxYExxiKRZIRENOfqQ8XEeg4Qs=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
 modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
-modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
+modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=
+modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.37.1 h1:EgHJK/FPoqC+q2YBXg7fUmES37pCHFc97sI7zSayBEs=
-modernc.org/sqlite v1.37.1/go.mod h1:XwdRtsE1MpiBcL54+MbKcaDvcuej+IYSMfLN6gSKV8g=
+modernc.org/sqlite v1.50.1 h1:l+cQvn0sd0zJJtfygGHuQJ5AjlrwXmWPw4KP3ZMwr9w=
+modernc.org/sqlite v1.50.1/go.mod h1:tcNzv5p84E0skkmJn038y+hWJbLQXQqEnQfeh5r2JLM=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

hangman_phrases.txt

@@ -0,0 +1,237 @@
+# GogoBee Hangman Seed Phrases -- Video Game Edition
+#
+# Tiers are assigned automatically by character count at load time.
+# Section headers below are for human readability only -- the bot ignores them.
+#
+#   Easy:   8-20 characters
+#   Medium: 21-40 characters
+#   Hard:   41-80 characters
+#
+# Add community phrases via: !hangman submit [phrase]
+# All submissions require LLM approval before entering the pool.
+# This file can be edited directly. Bot reloads on restart.
+
+# ---------------------------------------------------------------------------
+# EASY (8-20 characters)
+# ---------------------------------------------------------------------------
+
+Finish Him!
+Game Over
+Insert Coin
+Hadouken!
+Fatality!
+Big Boss
+Konami Code
+Warp Zone
+Blue Shell
+God Mode
+BFG 9000
+Cacodemon
+Quad Damage
+Samus Aran
+Morph Ball
+Mother Brain
+Dracula!
+Simon Belmont
+Ecclesia
+Outer Heaven
+Spread Gun
+Power Pellet
+Checkpoint
+Rocket Jump
+Mushroom Kingdom
+Princess Peach
+Bowser's Castle
+Fire Flower
+Varia Suit
+Space Jump
+Vampire Killer
+Holy Water
+Trevor Belmont
+Soma Cruz
+Julius Belmont
+Waluigi!
+Richter!
+Phantoon
+Speed Run
+High Score
+Continue?
+Press Start
+Ryu Hayabusa
+Plasma Gun
+What is a man?
+Serious Sam
+Shoryuken!
+Duck Hunt
+The cake is a lie
+War never changes
+Would you kindly?
+Do a barrel roll!
+Praise the Sun!
+A winner is you
+You're pretty good
+La-Li-Lu-Le-Lo
+I am error
+Leeroy Jenkins!
+For the Horde!
+For the Alliance!
+Frostmourne hungers
+Falcon Punch!
+Rip and tear!
+Vic Viper
+Salamander!
+Parodius Da!
+We'll bang, okay?
+What you say!!
+You spoony bard!
+One-Winged Angel
+Morning Star
+Glyph Union
+TwinBee, scramble!
+
+# ---------------------------------------------------------------------------
+# MEDIUM (21-40 characters)
+# ---------------------------------------------------------------------------
+
+Stay a while and listen
+It's dangerous to go alone!
+Kept you waiting, huh?
+A man chooses, a slave obeys
+Metal Gear?! Metal Gear!!
+We're not tools of the government
+The winds of destruction
+Who are the Patriots?
+This is good, isn't it?
+You have died of dysentery
+The Triforce of Courage
+Ganon has broken the seal!
+May the wind guide you home
+Dodongo dislikes smoke
+The right man in the wrong place
+Nothing is true, everything is permitted
+I used to be an adventurer like you
+You can't hide from the Grim Reaper
+All your base are belong to us!
+Somebody set up us the bomb!
+For great justice, take off every Zig!
+How are you gentlemen!!
+Kain has betrayed us!
+Garland will knock you all down!
+You are not prepared!
+I am Uther the Lightbringer!
+Order of Ecclesia calls
+The Dark Lord rises again!
+Shanoa, bearer of glyphs
+In this world, it's kill or be killed
+Despite everything, it's still you
+The Underground is your home now
+Papyrus demands a battle!
+I'm going to make spaghetti!
+Toriel will protect you
+Estus Flask replenished
+The age of fire fades
+Prepare to die, undead one
+Can't let you do that, Star Fox!
+Andross' empire spans the Lylat system!
+Captain Falcon, show me your moves!
+OBJECTION! That testimony is a lie!
+Hold it! I have new evidence!
+Phoenix Wright, attorney at law!
+Does this unit have a soul?
+Shepard, the Reapers are coming!
+Tali'Zorah vas Normandy!
+Gruntilda shall not be defeated!
+K. Rool has stolen the banana hoard!
+Kirby, hero of Dream Land!
+Meta Knight awaits your challenge!
+Congraturation! This story is happy end.
+Cecil has become a Paladin
+Cloud Strife, SOLDIER First Class
+Time compression is inevitable
+You require more vespene gas
+Nuclear launch detected
+You must construct additional pylons
+I'm Commander Shepard!
+War... War has changed.
+Rip and tear until it is done!
+Dawn of Sorrow awaits
+Do you feel like a hero yet?
+You're a monster. You know that, Walker?
+Halo... it's not a natural formation.
+Whip it good, Belmont!
+
+# ---------------------------------------------------------------------------
+# HARD (41-80 characters)
+# ---------------------------------------------------------------------------
+
+What is a man? A miserable pile of secrets!
+Die monster! You don't belong in this world!
+My name is Dracula, and I bid you welcome.
+You have no chance to survive make your time!
+You've met with a terrible fate, haven't you?
+Fear the old blood... and welcome, good hunter.
+Welcome to the Liandri Grand Tournament!
+I am the very model of a scientist Salarian!
+Metroid Prime has escaped into the impact crater!
+I want to be the very best, like no one ever was
+The world needs only one Big Boss... and one Snake.
+Snake, do you think love can bloom on a battlefield?
+Thank you Mario, but our princess is in another castle!
+You must gather your party before venturing forth
+Snake, we're not tools of the government, or anyone else
+Did I ever tell you what the definition of insanity is?
+They're everywhere! The demons... they won't stop coming!
+Dracula! Your time has come! The Vampire Killer strikes!
+Link... I'm Navi, your fairy companion! Listen!
+Hero of Time, your destiny awaits in the Sacred Realm
+Master Chief, finish the fight. Earth is counting on you.
+Outer Heaven... a place where warriors can find purpose
+We passed the point of no return a long time ago, Snake
+Liquid! I was the one who was meant to be the successor!
+Revolver Ocelot is a triple agent working for the Patriots
+Phazon corruption detected! Seek immediate medical attention!
+Dark Samus has absorbed the Phazon and grown more powerful!
+I'm the Doom Slayer, and I'm here to kill every last one of you!
+Praise the Chosen Undead, for they shall link the fire!
+Ganon is the evil king who stole the Triforce of Power!
+The legendary soldier who defied his genes... Big Boss
+Killing spree! Monster kill! Godlike! Unstoppable!
+Humanity restored! The bonfire blazes with newfound strength!
+You are the last line of defense against an infinite demonic army
+Liquid Snake... your dominant genes... give you the edge in battle!
+All we did was give meaning to the nuclear age by using nukes!
+I'm a soldier who's been betrayed, abandoned... I fight alone now
+Samus Aran, the last of the Chozo warriors, descends into the unknown
+You are the Chosen Undead, fated to succeed where so many have failed
+The price of living in the past is a slow death in the present
+A sword wields no strength unless the hands that hold it have courage
+The flow of time is always cruel, its speed seems different for each person
+Hey! Listen! There's something important you need to know!
+We are born of the blood, made men by the blood, undone by the blood
+War has changed. It's no longer about nations, ideologies, or ethnicity
+Mental has sent his armies, and I am all that stands between them and Earth!
+I'm no hero. Never was. Never will be. I'm just an old killer.
+What is a man? A miserable pile of secrets! But enough talk... have at you!
+I used to be an adventurer like you, then I took an arrow in the knee
+I'm not the only one who's responsible. The humans are just as guilty!
+The Skaarj have invaded, and you must fight your way to freedom
+
+# ---------------------------------------------------------------------------
+# EXTREME (81+ characters) -- Full quotes. No mercy.
+# ---------------------------------------------------------------------------
+
+For you, the day Bison graced your village was the most important day of your life. But for me... it was Tuesday.
+What is a man? A miserable pile of secrets! But enough talk... have at you!
+Die monster! You don't belong in this world! It was not by my hand that I am once again given flesh!
+You can't keep a good man down, and that goes double for a soldier who's been fighting his whole life.
+They say the definition of insanity is doing the same thing over and over and expecting different results... did I ever tell you that?
+I've been waiting for this... a professional killer. I'm so excited I may be sick!
+Kept you waiting, huh? Don't worry though. I'll take you somewhere warm. Back to the battlefield.
+It's easy to forget what a sin is in the middle of a battlefield. Especially when you're killing to stay alive.
+We are not tools of the government or anyone else. Fighting was the only thing, the only thing I was good at. But at least I always fought for what I believed in.
+In the 21st century, the battlefield will once again be a symbol of the glory of nations. I am a weapon. A human weapon.
+A man's dreams can be his greatest asset... or his most dangerous enemy. The question is: what are you willing to sacrifice to see them through?
+I need scissors! 61!
+Outer Heaven, a place where soldiers need not justify their actions -- where warriors can be free of political manipulation.
+Nothing happened to me. I happened. I'm the one who knocks, the one who causes all the trouble... that is my purpose.
+Sun Tzu said that. I think he meant it as a metaphor, but he also said never leave home without a healthy supply of rations, so what does he know?

internal/db/db.go

@@ -44,6 +44,10 @@ func Init(dataDir string) error {
 		return fmt.Errorf("run migrations: %w", err)
 	}
 
+	if err := snapshotPreDnD(d); err != nil {
+		slog.Error("db: pre-D&D snapshot failed (non-fatal)", "err", err)
+	}
+
 	globalDB = d
 	dataPath = dataDir
 	slog.Info("database initialized", "path", dbPath)
@@ -142,18 +146,243 @@ func runMigrations(d *sql.DB) error {
 		`ALTER TABLE coop_dungeon_gifts ADD COLUMN applied_at DATETIME`,
 		`ALTER TABLE coop_dungeon_gifts ADD COLUMN stack_lead_id INTEGER`,
 		`ALTER TABLE adventure_characters ADD COLUMN crafts_succeeded INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE adventure_characters ADD COLUMN death_source TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE adventure_characters ADD COLUMN death_location TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE adventure_characters ADD COLUMN auto_babysit_focus TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE adventure_characters ADD COLUMN treasures_locked INTEGER NOT NULL DEFAULT 0`,
+		// D&D layer (Phase 1) — additive columns on existing equipment/inventory tables
+		`ALTER TABLE adventure_equipment ADD COLUMN dnd_rarity TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE adventure_equipment ADD COLUMN dnd_stat_bonus_json TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE adventure_equipment ADD COLUMN dnd_attuned INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE adventure_inventory ADD COLUMN dnd_rarity TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE adventure_inventory ADD COLUMN dnd_stat_bonus_json TEXT NOT NULL DEFAULT ''`,
+		// Phase 2 cleanup: auto-migrated chars (created on first combat for
+		// players who never ran !setup). !setup can freely overwrite these.
+		`ALTER TABLE dnd_character ADD COLUMN auto_migrated INTEGER NOT NULL DEFAULT 0`,
+		// Phase 6 rest mechanics
+		`ALTER TABLE dnd_character ADD COLUMN last_short_rest_at DATETIME`,
+		`ALTER TABLE dnd_character ADD COLUMN last_long_rest_at DATETIME`,
+		// Phase 6 active abilities: armed for next combat
+		`ALTER TABLE dnd_character ADD COLUMN armed_ability TEXT NOT NULL DEFAULT ''`,
+		// Audit fix F: prevent onboarding DM from re-firing after !setup cancel
+		`ALTER TABLE dnd_character ADD COLUMN onboarding_sent INTEGER NOT NULL DEFAULT 0`,
+		// Phase 9 — spell system. pending_cast holds a JSON blob describing
+		// the queued spell (id, slot level, target, rolled effect args) that
+		// fires on the next one-shot combat. concentration_* track the
+		// currently-active concentration spell for buff persistence.
+		`ALTER TABLE dnd_character ADD COLUMN pending_cast TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE dnd_character ADD COLUMN concentration_spell TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE dnd_character ADD COLUMN concentration_expires_at DATETIME`,
+		// Phase 10 — subclass system. Subclass id is set at L5 via !subclass.
+		// last_subclass_respec_at gates the 30-day cooldown for changing it
+		// (separate from last_respec_at, which gates the full character wipe).
+		`ALTER TABLE dnd_character ADD COLUMN subclass TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE dnd_character ADD COLUMN last_subclass_respec_at DATETIME`,
+		// Phase 10 SUB2a — exhaustion levels. Berserker Frenzy increments
+		// this after each rage'd combat. Cleared on long rest. Reused by
+		// other classes once exhaustion-inducing mechanics arrive in SUB3+.
+		`ALTER TABLE dnd_character ADD COLUMN exhaustion INTEGER NOT NULL DEFAULT 0`,
+		// Standalone-zone-run harvest: stores a per-room HarvestNode map for
+		// !zone enter sessions that aren't tied to an expedition. Expedition
+		// runs continue to use expedition.region_state for the same data.
+		`ALTER TABLE dnd_zone_run ADD COLUMN harvest_nodes_json TEXT NOT NULL DEFAULT '{}'`,
+		// Adv 2.0 Phase L4f-prep — DisplayName migration off AdvCharacter.
+		// player_meta gets the canonical column; AdvCharacter.display_name
+		// keeps dual-writing during soak (gogobee_legacy_migration.md §7).
+		`ALTER TABLE player_meta ADD COLUMN display_name TEXT NOT NULL DEFAULT ''`,
+		// Adv 2.0 Phase L4a — Hospital migration off AdvCharacter.
+		// HospitalVisits moves to player_meta; AdvCharacter.hospital_visits
+		// keeps dual-writing during soak (gogobee_legacy_migration.md §6.1).
+		`ALTER TABLE player_meta ADD COLUMN hospital_visits INTEGER NOT NULL DEFAULT 0`,
+		// Adv 2.0 Phase L4b — Rival migration off AdvCharacter.
+		// RivalPool / RivalUnlockedNotified move to player_meta; AdvCharacter
+		// columns keep dual-writing during soak (gogobee_legacy_migration.md §6.2).
+		`ALTER TABLE player_meta ADD COLUMN rival_pool INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN rival_unlocked_notified INTEGER NOT NULL DEFAULT 0`,
+		// Adv 2.0 Phase L4c — Masterwork migration off AdvCharacter.
+		// MasterworkDropsReceived moves to player_meta; AdvCharacter column
+		// keeps dual-writing during soak (gogobee_legacy_migration.md §6.3).
+		`ALTER TABLE player_meta ADD COLUMN masterwork_drops_received INTEGER NOT NULL DEFAULT 0`,
+		// Adv 2.0 Phase L4d — Pets migration off AdvCharacter.
+		// PetType / PetName / PetXP / PetLevel / PetArmorTier and the four
+		// pet flags (arrived, chased_away, reactivated, morning_defense)
+		// move to player_meta; AdvCharacter columns keep dual-writing during
+		// soak (gogobee_legacy_migration.md §6.4).
+		`ALTER TABLE player_meta ADD COLUMN pet_type TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN pet_name TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN pet_xp INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN pet_level INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN pet_armor_tier INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN pet_flags_json TEXT NOT NULL DEFAULT '{}'`,
+		`ALTER TABLE player_meta ADD COLUMN pet_supply_shop_unlocked INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN pet_level_10_date TEXT NOT NULL DEFAULT ''`,
+		// Adv 2.0 Phase L4e — Housing & mortgage migration off AdvCharacter.
+		// HouseTier / HouseLoanBalance / HouseLoanFrozen / HouseMissedPayments
+		// / HouseAutopay / HouseCurrentRate move to player_meta; AdvCharacter
+		// columns keep dual-writing during soak (gogobee_legacy_migration.md §6.5).
+		`ALTER TABLE player_meta ADD COLUMN house_tier INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN house_loan_balance INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN house_loan_frozen INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN house_missed_payments INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN house_autopay INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN house_current_rate REAL NOT NULL DEFAULT 0`,
+		// Adv 2.0 Phase L5a — Skills migration off AdvCharacter.
+		// CombatLevel / MiningSkill / ForagingSkill / FishingSkill and their
+		// XP counters move to player_meta; AdvCharacter columns keep
+		// dual-writing during soak (gogobee_legacy_migration.md §7.3 L5a).
+		// CombatLevel/CombatXP are transitional — dropped after L5g's
+		// DnDCharacter mass-backfill retires the dndLevelFromCombatLevel
+		// fallback.
+		`ALTER TABLE player_meta ADD COLUMN combat_level INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN combat_xp INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN mining_skill INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN mining_xp INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN foraging_skill INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN foraging_xp INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN fishing_skill INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN fishing_xp INTEGER NOT NULL DEFAULT 0`,
+		// Adv 2.0 Phase L5b — Babysit state migration off AdvCharacter.
+		// BabysitActive / BabysitExpiresAt / BabysitSkillFocus / AutoBabysit /
+		// AutoBabysitFocus move to player_meta; AdvCharacter columns keep
+		// dual-writing during soak (gogobee_legacy_migration.md §7.3 L5b).
+		`ALTER TABLE player_meta ADD COLUMN babysit_active INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN babysit_expires_at DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN babysit_skill_focus TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN auto_babysit INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN auto_babysit_focus TEXT NOT NULL DEFAULT ''`,
+		// Adv 2.0 Phase L5c — NPC counters & debuff timestamps off AdvCharacter.
+		// Misty/Arina/Robbie/Thom counters and buff/debuff expiry times move
+		// to player_meta (gogobee_legacy_migration.md §7.3 L5c). Hidden
+		// discovery mechanics — never surface in player-facing output.
+		`ALTER TABLE player_meta ADD COLUMN misty_last_seen DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN arina_last_seen DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN misty_buff_expires DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN misty_debuff_expires DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN arina_buff_expires DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN npc_msg_count INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN npc_msg_count_date TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN misty_roll_target INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN arina_roll_target INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN misty_encounter_count INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN misty_donated_count INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN thom_animal_line_fired INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN robbie_visit_count INTEGER NOT NULL DEFAULT 0`,
+		// Adv 2.0 Phase L5d — Streak/action/lifecycle migration off AdvCharacter.
+		// Streak (current/best/decayed/last_action_date), per-day action flags
+		// (action_taken_today/holiday_action_taken/combat_actions_used/
+		// harvest_actions_used), and lifecycle timestamps (created_at /
+		// last_active_at) move to player_meta (gogobee_legacy_migration.md
+		// §7.3 L5d).
+		`ALTER TABLE player_meta ADD COLUMN current_streak INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN best_streak INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN last_action_date TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN streak_decayed INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN action_taken_today INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN holiday_action_taken INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN combat_actions_used INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN harvest_actions_used INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN created_at DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN last_active_at DATETIME`,
+		// Adv 2.0 Phase L5e — Death state migration off AdvCharacter.
+		// Alive / DeadUntil / DeathReprieveLast / LastDeathDate /
+		// LastPardonUsed / GrudgeLocation / DeathSource / DeathLocation move
+		// to player_meta. Dual-write strategy switches to inside
+		// saveAdvCharacter (death state mutates at ~50 save sites; per-site
+		// upserts would be too noisy — gogobee_legacy_migration.md §7.3
+		// L5e). `Alive` defaults to 1 since legacy created characters are
+		// alive, and a never-migrated row should fall through to the legacy
+		// table via loadDeathState.
+		`ALTER TABLE player_meta ADD COLUMN alive INTEGER NOT NULL DEFAULT 1`,
+		`ALTER TABLE player_meta ADD COLUMN dead_until DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN death_reprieve_last DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN last_death_date TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN last_pardon_used DATETIME`,
+		`ALTER TABLE player_meta ADD COLUMN grudge_location TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN death_source TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN death_location TEXT NOT NULL DEFAULT ''`,
+		// Adv 2.0 Phase L5f — Misc fields (Title, TreasuresLocked,
+		// CraftsSucceeded) off AdvCharacter (gogobee_legacy_migration.md
+		// §7.3 L5f). Dual-write inside saveAdvCharacter (same as L5e).
+		`ALTER TABLE player_meta ADD COLUMN title TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE player_meta ADD COLUMN treasures_locked INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE player_meta ADD COLUMN crafts_succeeded INTEGER NOT NULL DEFAULT 0`,
+		// Adv 2.0 Phase G1 — branching zone graph run-state columns.
+		// current_node / visited_nodes / node_choices live alongside the
+		// legacy current_room / room_seq_json during the migration; the
+		// linear columns retire in G9 (gogobee_branching_zones_plan.md §2).
+		`ALTER TABLE dnd_zone_run ADD COLUMN current_node TEXT NOT NULL DEFAULT ''`,
+		`ALTER TABLE dnd_zone_run ADD COLUMN visited_nodes TEXT NOT NULL DEFAULT '[]'`,
+		`ALTER TABLE dnd_zone_run ADD COLUMN node_choices TEXT NOT NULL DEFAULT '{}'`,
+		// 2026-05-10 immersion pass: short rest = hit-dice charges (1/level),
+		// long rest restores them. resting_until gates !zone enter and
+		// !expedition start so a freshly-rested character can't immediately
+		// jump back into combat — they're actually resting for the duration.
+		`ALTER TABLE dnd_character ADD COLUMN short_rest_charges INTEGER NOT NULL DEFAULT 0`,
+		`ALTER TABLE dnd_character ADD COLUMN resting_until DATETIME`,
+		// Phase 12 E7 (expedition autopilot Phase 3) — ambient ticker timestamp.
+		// Real-time between-day events fire at most once per ambientCooldown
+		// while an expedition is active; idempotent CAS on this column.
+		`ALTER TABLE dnd_expedition ADD COLUMN last_ambient_at DATETIME`,
+		// Kind-level anti-repeat for the ambient ticker: the previous
+		// pick's Kind biases the next pick away from itself so two
+		// back-to-back pack_rat / monologue / etc. DMs don't read as
+		// duplicates on small flavor pools.
+		`ALTER TABLE dnd_expedition ADD COLUMN last_ambient_kind TEXT NOT NULL DEFAULT ''`,
+		// Expedition autopilot Phase 4 — background auto-run ticker. Real-
+		// time room-walking between player commands so the player only
+		// engages when a fork / elite / boss / supply pinch actually
+		// needs a decision. CAS-claim on this column gates re-entry.
+		`ALTER TABLE dnd_expedition ADD COLUMN last_autorun_at DATETIME`,
 	}
 	for _, stmt := range columnMigrations {
 		if _, err := d.Exec(stmt); err != nil {
+			msg := err.Error()
 			// "duplicate column name" means it already exists — safe to ignore.
-			if !strings.Contains(err.Error(), "duplicate column") {
-				return fmt.Errorf("migration %q: %w", stmt, err)
+			// "no such table: adventure_characters" is expected after the
+			// L5 close-out purge (GOGOBEE_LEGACY_PURGE=1).
+			if strings.Contains(msg, "duplicate column") {
+				continue
 			}
+			if strings.Contains(msg, "no such table: adventure_characters") {
+				continue
+			}
+			return fmt.Errorf("migration %q: %w", stmt, err)
 		}
 	}
 	return nil
 }
 
+// snapshotPreDnD copies the current adventure_characters rows into
+// adventure_characters_pre_dnd as a one-shot rollback safety net for the
+// D&D-layer migration. Idempotent: only inserts rows for user_ids that
+// aren't already snapshotted. Skips silently once the source table has
+// been dropped by the L5 close-out purge (GOGOBEE_LEGACY_PURGE=1).
+func snapshotPreDnD(d *sql.DB) error {
+	var name string
+	if err := d.QueryRow(
+		`SELECT name FROM sqlite_master WHERE type='table' AND name='adventure_characters'`,
+	).Scan(&name); err == sql.ErrNoRows {
+		return nil
+	} else if err != nil {
+		return err
+	}
+	_, err := d.Exec(`
+		INSERT OR IGNORE INTO adventure_characters_pre_dnd (user_id, snapshot_json)
+		SELECT user_id,
+		       json_object(
+		         'combat_level', combat_level,
+		         'combat_xp', combat_xp,
+		         'mining_skill', mining_skill, 'mining_xp', mining_xp,
+		         'foraging_skill', foraging_skill, 'foraging_xp', foraging_xp,
+		         'fishing_skill', fishing_skill, 'fishing_xp', fishing_xp,
+		         'arena_wins', arena_wins, 'arena_losses', arena_losses,
+		         'current_streak', current_streak, 'best_streak', best_streak
+		       )
+		FROM adventure_characters
+	`)
+	return err
+}
+
 // JobCompleted checks if a scheduled job has already completed for the given date key.
 // Use date "2006-01-02" for daily jobs, or "2006-W01" style for weekly jobs.
 func JobCompleted(jobName, dateKey string) bool {
@@ -244,8 +473,16 @@ func CacheSet(key, data string) {
 
 // Backup creates a consistent snapshot of the database using VACUUM INTO.
 // Keeps the last 7 daily backups, deleting older ones.
+//
+// Gated on the GOGOBEE_BACKUP_DIR env var: when unset, this is a no-op so
+// dev environments don't accumulate snapshots. When set, that directory is
+// used as the backup destination.
 func Backup() error {
-	backupDir := filepath.Join(dataPath, "backups")
+	backupDir := os.Getenv("GOGOBEE_BACKUP_DIR")
+	if backupDir == "" {
+		slog.Debug("backup skipped: GOGOBEE_BACKUP_DIR unset")
+		return nil
+	}
 	if err := os.MkdirAll(backupDir, 0o755); err != nil {
 		return fmt.Errorf("create backup dir: %w", err)
 	}
@@ -333,7 +570,23 @@ func RunMaintenance() {
 		{"market_daily_summary", `DELETE FROM market_daily_summary WHERE snapshot_date < ?`, []interface{}{now.AddDate(-1, 0, 0).Format("2006-01-02")}},
 	}
 
+	// Wrap the purge loop in a single BEGIN IMMEDIATE / COMMIT so a crash
+	// mid-maintenance can't leave half the tables purged. SetMaxOpenConns(1)
+	// in Init guarantees the BEGIN, the DELETEs, and the COMMIT all share
+	// the same connection.
 	totalDeleted := int64(0)
+	if _, err := d.Exec(`BEGIN IMMEDIATE`); err != nil {
+		slog.Error("maintenance: begin tx", "err", err)
+		return
+	}
+	committed := false
+	defer func() {
+		if !committed {
+			if _, err := d.Exec(`ROLLBACK`); err != nil {
+				slog.Error("maintenance: rollback", "err", err)
+			}
+		}
+	}()
 	for _, q := range queries {
 		res, err := d.Exec(q.sql, q.args...)
 		if err != nil {
@@ -346,15 +599,73 @@ func RunMaintenance() {
 			totalDeleted += n
 		}
 	}
+	if _, err := d.Exec(`COMMIT`); err != nil {
+		slog.Error("maintenance: commit", "err", err)
+		return
+	}
+	committed = true
 
 	// SQLite optimization
 	if _, err := d.Exec(`PRAGMA optimize`); err != nil {
 		slog.Error("maintenance: pragma optimize", "err", err)
 	}
 
+	// Weekly integrity check, gated on a sentinel file's mtime under dataPath
+	// so it runs at most once every 7 days regardless of maintenance cadence.
+	runIntegrityCheckIfDue(d)
+
 	slog.Info("maintenance: complete", "total_purged", totalDeleted)
 }
 
+// runIntegrityCheckIfDue runs `PRAGMA integrity_check` at most once per week.
+// Cadence is tracked via the mtime of a sentinel file under dataPath; if the
+// sentinel is missing or older than 7 days, the check runs and the sentinel
+// is touched. Any result other than "ok" is logged via slog.Error.
+func runIntegrityCheckIfDue(d *sql.DB) {
+	if dataPath == "" {
+		return
+	}
+	sentinel := filepath.Join(dataPath, ".integrity_check_last")
+	if info, err := os.Stat(sentinel); err == nil {
+		if time.Since(info.ModTime()) < 7*24*time.Hour {
+			return
+		}
+	}
+
+	rows, err := d.Query(`PRAGMA integrity_check`)
+	if err != nil {
+		slog.Error("maintenance: integrity_check", "err", err)
+		return
+	}
+	var problems []string
+	for rows.Next() {
+		var line string
+		if err := rows.Scan(&line); err != nil {
+			slog.Error("maintenance: integrity_check scan", "err", err)
+			continue
+		}
+		if line != "ok" {
+			problems = append(problems, line)
+		}
+	}
+	rows.Close()
+
+	if len(problems) > 0 {
+		slog.Error("maintenance: integrity_check failed", "problems", problems)
+	} else {
+		slog.Info("maintenance: integrity_check ok")
+	}
+
+	// Touch the sentinel even on failure — otherwise a corrupted DB would
+	// re-run the (expensive) check every maintenance cycle and spam logs.
+	now := time.Now()
+	if err := os.WriteFile(sentinel, nil, 0o644); err != nil {
+		slog.Error("maintenance: write integrity sentinel", "err", err)
+		return
+	}
+	_ = os.Chtimes(sentinel, now, now)
+}
+
 // Exec runs a write query, logging any error with the given label.
 // Use for fire-and-forget writes where the error doesn't affect control flow.
 func Exec(label, query string, args ...interface{}) {
@@ -997,34 +1308,9 @@ CREATE TABLE IF NOT EXISTS space_groups (
 
 -- ── Adventure Plugin ────────────────────────────────────────────────────────
 
-CREATE TABLE IF NOT EXISTS adventure_characters (
-	user_id              TEXT PRIMARY KEY,
-	display_name         TEXT NOT NULL,
-	combat_level         INTEGER NOT NULL DEFAULT 1,
-	mining_skill         INTEGER NOT NULL DEFAULT 1,
-	foraging_skill       INTEGER NOT NULL DEFAULT 1,
-	fishing_skill        INTEGER NOT NULL DEFAULT 1,
-	combat_xp            INTEGER NOT NULL DEFAULT 0,
-	mining_xp            INTEGER NOT NULL DEFAULT 0,
-	foraging_xp          INTEGER NOT NULL DEFAULT 0,
-	fishing_xp           INTEGER NOT NULL DEFAULT 0,
-	alive                INTEGER NOT NULL DEFAULT 1,
-	dead_until           DATETIME,
-	action_taken_today   INTEGER NOT NULL DEFAULT 0,
-	holiday_action_taken INTEGER NOT NULL DEFAULT 0,
-	arena_wins           INTEGER NOT NULL DEFAULT 0,
-	arena_losses         INTEGER NOT NULL DEFAULT 0,
-	invasion_score       INTEGER NOT NULL DEFAULT 0,
-	title                TEXT NOT NULL DEFAULT '',
-	current_streak       INTEGER NOT NULL DEFAULT 0,
-	best_streak          INTEGER NOT NULL DEFAULT 0,
-	last_action_date     TEXT NOT NULL DEFAULT '',
-	grudge_location      TEXT NOT NULL DEFAULT '',
-	created_at           DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	last_active_at       DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	death_reprieve_last  DATETIME,
-	masterwork_drops_received INTEGER NOT NULL DEFAULT 0
-);
+-- adventure_characters was retired in the L5 close-out. Per-user state lives
+-- in player_meta now; the table is dropped via GOGOBEE_LEGACY_PURGE=1 and
+-- the schema CREATE has been removed so it is not re-instated on next boot.
 
 CREATE TABLE IF NOT EXISTS adventure_equipment (
 	user_id      TEXT NOT NULL,
@@ -1078,6 +1364,19 @@ CREATE TABLE IF NOT EXISTS adventure_treasures (
 );
 CREATE INDEX IF NOT EXISTS idx_adv_treasure_user ON adventure_treasures(user_id);
 
+-- Magic items equipped into the D&D 10-slot scheme (Open5e SRD registry).
+-- One row per (user, DnDSlot). item_id references magicItemRegistry. Effects
+-- are applied in combat from a codified Rarity+Kind formula; attunement gates
+-- whether the item's effect counts (see magic_items_gameplay.go).
+CREATE TABLE IF NOT EXISTS magic_item_equipped (
+	user_id  TEXT NOT NULL,
+	slot     TEXT NOT NULL,
+	item_id  TEXT NOT NULL,
+	attuned  INTEGER NOT NULL DEFAULT 0,
+	PRIMARY KEY (user_id, slot)
+);
+CREATE INDEX IF NOT EXISTS idx_magic_item_equipped_user ON magic_item_equipped(user_id);
+
 CREATE TABLE IF NOT EXISTS adventure_buffs (
 	id         INTEGER PRIMARY KEY AUTOINCREMENT,
 	user_id    TEXT NOT NULL,
@@ -1455,6 +1754,285 @@ CREATE TABLE IF NOT EXISTS coop_dungeon_gifts (
     stack_lead_id INTEGER                        -- NULL for lead/standalone; follower points to lead's id
 );
 CREATE INDEX IF NOT EXISTS idx_coop_gifts_run_day ON coop_dungeon_gifts(run_id, day, vote_result);
+
+-- ── D&D Layer (Phase 1) ────────────────────────────────────────────────────
+-- Per-player D&D character state. Sits alongside adventure_characters; players
+-- without a row here continue using the legacy adventure system unchanged.
+-- pending_setup=1 means a draft (race/class/stats may be partial).
+-- pending_setup=0 means !setup confirmed; D&D-gated commands available.
+CREATE TABLE IF NOT EXISTS dnd_character (
+    user_id        TEXT PRIMARY KEY,
+    race           TEXT NOT NULL DEFAULT '',
+    class          TEXT NOT NULL DEFAULT '',
+    dnd_level      INTEGER NOT NULL DEFAULT 1,
+    dnd_xp         INTEGER NOT NULL DEFAULT 0,
+    str_score      INTEGER NOT NULL DEFAULT 8,
+    dex_score      INTEGER NOT NULL DEFAULT 8,
+    con_score      INTEGER NOT NULL DEFAULT 8,
+    int_score      INTEGER NOT NULL DEFAULT 8,
+    wis_score      INTEGER NOT NULL DEFAULT 8,
+    cha_score      INTEGER NOT NULL DEFAULT 8,
+    hp_current     INTEGER NOT NULL DEFAULT 0,
+    hp_max         INTEGER NOT NULL DEFAULT 0,
+    temp_hp        INTEGER NOT NULL DEFAULT 0,
+    armor_class    INTEGER NOT NULL DEFAULT 10,
+    pending_setup  INTEGER NOT NULL DEFAULT 1,
+    last_respec_at DATETIME,
+    created_at     DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at     DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE IF NOT EXISTS dnd_abilities (
+    user_id      TEXT NOT NULL,
+    ability_id   TEXT NOT NULL,
+    uses_left    INTEGER NOT NULL DEFAULT 0,
+    acquired_at  DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (user_id, ability_id)
+);
+
+CREATE TABLE IF NOT EXISTS dnd_resources (
+    user_id        TEXT NOT NULL,
+    resource_type  TEXT NOT NULL,    -- stamina|focus|mana|divine_favor|spell_slot_1
+    current_value  INTEGER NOT NULL DEFAULT 0,
+    max_value      INTEGER NOT NULL DEFAULT 0,
+    last_reset_at  DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (user_id, resource_type)
+);
+
+CREATE TABLE IF NOT EXISTS dnd_combat_state (
+    user_id        TEXT PRIMARY KEY,
+    enemy_id       TEXT NOT NULL DEFAULT '',
+    round          INTEGER NOT NULL DEFAULT 0,
+    player_turn    INTEGER NOT NULL DEFAULT 1,
+    conditions_json TEXT NOT NULL DEFAULT '[]',
+    log_json       TEXT NOT NULL DEFAULT '[]',
+    started_at     DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- ── D&D Layer (Phase 9 — spells) ──────────────────────────────────────────
+-- Per-player known spell list. For Cleric, prepared=0 means the spell is on
+-- the class list but not currently prepared (cast unavailable until prepared).
+-- For Mage/Ranger, prepared is always 1 (spells known are always castable).
+CREATE TABLE IF NOT EXISTS dnd_known_spells (
+    user_id    TEXT NOT NULL,
+    spell_id   TEXT NOT NULL,
+    source     TEXT NOT NULL DEFAULT '',  -- class | subclass | racial
+    prepared   INTEGER NOT NULL DEFAULT 1,
+    learned_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (user_id, spell_id)
+);
+
+-- Per-player spell slot pool, one row per (user, slot_level). slot_level is
+-- 1..5 (no cantrip row — cantrips have no slot cost). Refreshed on long rest.
+CREATE TABLE IF NOT EXISTS dnd_spell_slots (
+    user_id    TEXT NOT NULL,
+    slot_level INTEGER NOT NULL,
+    total      INTEGER NOT NULL DEFAULT 0,
+    used       INTEGER NOT NULL DEFAULT 0,
+    PRIMARY KEY (user_id, slot_level)
+);
+
+-- One-shot snapshot of adventure_characters taken at first deploy of the D&D layer.
+-- Rollback safety net: if anything in adventure_characters diverges unexpectedly,
+-- compare to this snapshot to detect data corruption.
+CREATE TABLE IF NOT EXISTS adventure_characters_pre_dnd (
+    user_id          TEXT PRIMARY KEY,
+    snapshot_json    TEXT NOT NULL,
+    snapshotted_at   DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- ── D&D Layer (Phase 11 D1b — zone runs) ───────────────────────────────────
+-- A single in-progress or completed dungeon run. One row per run; players
+-- may have at most one row with completed_at IS NULL AND abandoned = 0
+-- (enforced in code, not via constraint, to keep migrations simple).
+-- rooms_cleared is a JSON array of room indices the player has resolved
+-- (combat won / trap survived / etc.). The zone-graph columns
+-- (current_node, visited_nodes, node_choices) are added in Phase G1's
+-- columnMigrations; the legacy linear current_room / room_seq_json
+-- columns retired in G9.
+CREATE TABLE IF NOT EXISTS dnd_zone_run (
+    run_id          TEXT PRIMARY KEY,
+    user_id         TEXT NOT NULL,
+    zone_id         TEXT NOT NULL,
+    total_rooms     INTEGER NOT NULL,
+    rooms_cleared   TEXT NOT NULL DEFAULT '[]',
+    boss_defeated   INTEGER NOT NULL DEFAULT 0,
+    abandoned       INTEGER NOT NULL DEFAULT 0,
+    loot_collected  TEXT NOT NULL DEFAULT '[]',
+    gm_mood         INTEGER NOT NULL DEFAULT 50,
+    started_at      DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    last_action_at  DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    completed_at    DATETIME
+);
+CREATE INDEX IF NOT EXISTS idx_zone_run_active
+    ON dnd_zone_run(user_id, completed_at, abandoned);
+
+-- ── D&D Layer (Phase 12 E1a — expeditions) ─────────────────────────────────
+-- A multi-day expedition wrapping a zone run. The expedition tracks
+-- real-world day count, supplies, camp state, threat clock, and zone-specific
+-- temporal stacks (heat / instability / time distortion). One active row
+-- per player (status='active'); enforced in code.
+--
+-- supplies_json:    serialized ExpeditionSupplies (current, max, daily_burn, harsh_mod, foraged_today)
+-- camp_json:        serialized *CampState (NULL when no camp pitched)
+-- threat_events:    serialized []ThreatEvent log
+-- region_state:     serialized region progression for Tier 4-5 zones (E4)
+CREATE TABLE IF NOT EXISTS dnd_expedition (
+    expedition_id    TEXT PRIMARY KEY,
+    user_id          TEXT NOT NULL,
+    zone_id          TEXT NOT NULL,
+    run_id           TEXT,                              -- FK-ish: dnd_zone_run.run_id
+    status           TEXT NOT NULL DEFAULT 'active',    -- active|extracting|complete|failed|abandoned
+    start_date       DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    current_day      INTEGER NOT NULL DEFAULT 1,
+    current_region   TEXT NOT NULL DEFAULT '',
+    boss_defeated    INTEGER NOT NULL DEFAULT 0,
+    supplies_json    TEXT NOT NULL DEFAULT '{}',
+    camp_json        TEXT,
+    threat_level     INTEGER NOT NULL DEFAULT 0,
+    threat_siege     INTEGER NOT NULL DEFAULT 0,
+    threat_events    TEXT NOT NULL DEFAULT '[]',
+    temporal_stack   INTEGER NOT NULL DEFAULT 0,        -- heat / instability / etc.
+    region_state     TEXT NOT NULL DEFAULT '{}',
+    xp_earned        INTEGER NOT NULL DEFAULT 0,
+    coins_earned     INTEGER NOT NULL DEFAULT 0,
+    gm_mood          INTEGER NOT NULL DEFAULT 50,
+    last_briefing_at DATETIME,
+    last_recap_at    DATETIME,
+    last_ambient_at  DATETIME,
+    last_ambient_kind TEXT NOT NULL DEFAULT '',
+    last_autorun_at  DATETIME,
+    last_activity    DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    completed_at     DATETIME
+);
+CREATE INDEX IF NOT EXISTS idx_expedition_active
+    ON dnd_expedition(user_id, status);
+CREATE INDEX IF NOT EXISTS idx_expedition_run
+    ON dnd_expedition(run_id);
+
+-- One row per ExpeditionEntry (§9). Cheap to append; queried last-N for
+-- !expedition log and to reconstruct overnight events for morning briefings.
+CREATE TABLE IF NOT EXISTS dnd_expedition_log (
+    entry_id        INTEGER PRIMARY KEY AUTOINCREMENT,
+    expedition_id   TEXT NOT NULL,
+    day             INTEGER NOT NULL,
+    timestamp       DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    entry_type      TEXT NOT NULL,                      -- action|combat|rest|event|narrative|briefing|recap
+    summary         TEXT NOT NULL DEFAULT '',
+    flavor          TEXT NOT NULL DEFAULT ''
+);
+CREATE INDEX IF NOT EXISTS idx_expedition_log_recent
+    ON dnd_expedition_log(expedition_id, timestamp DESC);
+
+-- One row per (user_id, recipe_id) once the player has discovered a Thom
+-- Krooke crafting recipe via !lore (Phase R5). Recipes are otherwise hidden
+-- from !craft list output until discovered.
+CREATE TABLE IF NOT EXISTS dnd_known_recipe (
+    user_id       TEXT NOT NULL,
+    recipe_id     TEXT NOT NULL,
+    discovered_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (user_id, recipe_id)
+);
+
+-- ── Adv 2.0 Phase G1 — branching zone graph (zones as directed graphs) ────
+-- Replaces the linear room_seq_json model with a directed-graph topology.
+-- A zone has many nodes (rooms, forks, secrets, boss) and edges connecting
+-- them. Edges may be locked behind Perception checks, keys, level gates,
+-- or region-clear flags. Authoring lives in Go (registerZoneGraph); these
+-- tables are the persisted shape for runtime lookups + future tooling.
+-- See gogobee_branching_zones_plan.md §2 for the full schema rationale.
+CREATE TABLE IF NOT EXISTS zone_node (
+    node_id        TEXT PRIMARY KEY,           -- "crypt_valdris.entry"
+    zone_id        TEXT NOT NULL,
+    region_id      TEXT NOT NULL DEFAULT '',   -- empty for single-region zones
+    kind           TEXT NOT NULL,              -- entry|exploration|trap|elite|boss|harvest|rest_camp|secret|fork|merge
+    label          TEXT NOT NULL DEFAULT '',   -- human-readable for !zone map
+    is_entry       INTEGER NOT NULL DEFAULT 0,
+    is_boss        INTEGER NOT NULL DEFAULT 0,
+    pos_x          INTEGER NOT NULL DEFAULT 0,
+    pos_y          INTEGER NOT NULL DEFAULT 0,
+    content_json   TEXT NOT NULL DEFAULT '{}'
+);
+CREATE INDEX IF NOT EXISTS idx_zone_node_zone ON zone_node(zone_id);
+
+CREATE TABLE IF NOT EXISTS zone_edge (
+    edge_id        INTEGER PRIMARY KEY AUTOINCREMENT,
+    zone_id        TEXT NOT NULL,
+    from_node      TEXT NOT NULL,              -- FK-ish: zone_node.node_id
+    to_node        TEXT NOT NULL,              -- FK-ish: zone_node.node_id
+    lock_kind      TEXT NOT NULL DEFAULT 'none', -- none|perception_check|key_required|level_min|region_clear|stat_check
+    lock_data_json TEXT NOT NULL DEFAULT '{}',
+    hint           TEXT NOT NULL DEFAULT '',
+    weight         INTEGER NOT NULL DEFAULT 1
+);
+CREATE INDEX IF NOT EXISTS idx_zone_edge_from ON zone_edge(zone_id, from_node);
+
+-- ── Adv 2.0 Phase L2 step 5 — player_meta ──────────────────────────────────
+-- Holding pen for non-stat per-user state migrating off adventure_characters
+-- (gogobee_legacy_migration.md §2.1). Each L-phase ALTER TABLEs in the
+-- columns it needs; this initial CREATE only covers L2's three arena
+-- counters. The dual-write rule (§11) applies: writes go to both this
+-- table and adventure_characters until a phase soaks clean for one week.
+CREATE TABLE IF NOT EXISTS player_meta (
+    user_id         TEXT PRIMARY KEY,
+    arena_wins      INTEGER NOT NULL DEFAULT 0,
+    arena_losses    INTEGER NOT NULL DEFAULT 0,
+    invasion_score  INTEGER NOT NULL DEFAULT 0,
+    display_name    TEXT NOT NULL DEFAULT '',
+    hospital_visits INTEGER NOT NULL DEFAULT 0
+);
+
+CREATE TABLE IF NOT EXISTS space_inviter_prompts (
+    user_id          TEXT NOT NULL,
+    prompt_sent_at   INTEGER NOT NULL,
+    trigger_kind     TEXT NOT NULL,
+    dm_room_id       TEXT NOT NULL,
+    dm_event_id      TEXT NOT NULL,
+    reply            TEXT,
+    replied_at       INTEGER,
+    invite_attempted INTEGER NOT NULL DEFAULT 0,
+    invite_outcome   TEXT,
+    invite_error     TEXT,
+    PRIMARY KEY (user_id, prompt_sent_at)
+);
+CREATE INDEX IF NOT EXISTS idx_space_inviter_user ON space_inviter_prompts(user_id);
+
+-- ── Turn-based combat — persistent per-fight session ───────────────────────
+-- One row per manual elite/boss fight. Persists across bot restarts and
+-- player away-from-keyboard so a fight can resume (or be auto-finished by
+-- the timeout reaper) from exact mid-state. At most one row per user with
+-- status='active' (enforced in code, not by constraint).
+--
+-- encounter_id:    room/node id within the run this fight belongs to.
+-- enemy_id:        bestiary stat-block id for the elite/boss.
+-- phase:           intra-round state machine position.
+-- statuses_json:   serialized player + enemy status effects (poison, etc.).
+-- turn_log_json:   per-round event stream, consumed by live narration.
+-- expires_at:      started_at + 1h; reaper auto-plays the fight to a real
+--                  win/loss from persisted state once this passes.
+CREATE TABLE IF NOT EXISTS combat_session (
+    session_id      TEXT PRIMARY KEY,
+    user_id         TEXT NOT NULL,
+    run_id          TEXT NOT NULL,
+    encounter_id    TEXT NOT NULL,
+    enemy_id        TEXT NOT NULL,
+    round           INTEGER NOT NULL DEFAULT 1,
+    phase           TEXT NOT NULL DEFAULT 'player_turn', -- player_turn|enemy_turn|round_end|over
+    player_hp       INTEGER NOT NULL,
+    player_hp_max   INTEGER NOT NULL,
+    enemy_hp        INTEGER NOT NULL,
+    enemy_hp_max    INTEGER NOT NULL,
+    statuses_json   TEXT NOT NULL DEFAULT '{}',
+    turn_log_json   TEXT NOT NULL DEFAULT '[]',
+    status          TEXT NOT NULL DEFAULT 'active',      -- active|won|lost|fled|expired
+    started_at      DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    last_action_at  DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    expires_at      DATETIME NOT NULL
+);
+CREATE INDEX IF NOT EXISTS idx_combat_session_active
+    ON combat_session(user_id, status);
+CREATE INDEX IF NOT EXISTS idx_combat_session_expiry
+    ON combat_session(status, expires_at);
 `
 
 // SeedSchedulerDefaults inserts default scheduler jobs if they don't exist.

internal/db/proddb_integration_test.go

@@ -0,0 +1,189 @@
+package db
+
+import (
+	"database/sql"
+	"io"
+	"os"
+	"path/filepath"
+	"testing"
+
+	_ "modernc.org/sqlite"
+)
+
+// TestProdDBMigrations runs the full migration suite against a copy of the
+// real prod database to verify Phase 1 + Phase 2 schema changes apply cleanly.
+//
+// Gated on the prod-db file actually existing — skips silently in CI.
+// Mutations write only to the tempdir copy; the real prod file is untouched.
+func TestProdDBMigrations(t *testing.T) {
+	src := "/home/reala-misaki/git/gogobee/data/gogobee.db"
+	if _, err := os.Stat(src); err != nil {
+		t.Skip("prod db not present at " + src)
+	}
+
+	dir := t.TempDir()
+	dst := filepath.Join(dir, "gogobee.db")
+	copyFile(t, src, dst)
+
+	// Snapshot row counts BEFORE migration via a raw connection.
+	preCounts := tableCounts(t, dst, []string{
+		"adventure_characters",
+		"euro_balances",
+		"user_archetypes",
+		"adventure_equipment",
+		"adventure_inventory",
+		"adventure_treasures",
+	})
+	t.Logf("pre-migration counts: %+v", preCounts)
+
+	// Reset global state (other tests may have run Init already).
+	Close()
+
+	// Run migrations via the production code path.
+	if err := Init(dir); err != nil {
+		t.Fatalf("Init failed: %v", err)
+	}
+	t.Cleanup(Close)
+
+	d := Get()
+
+	// 1. New D&D tables must exist.
+	for _, table := range []string{
+		"dnd_character", "dnd_abilities", "dnd_resources",
+		"dnd_combat_state", "adventure_characters_pre_dnd",
+	} {
+		var n int
+		if err := d.QueryRow(
+			`SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name=?`,
+			table,
+		).Scan(&n); err != nil {
+			t.Fatalf("query %s: %v", table, err)
+		}
+		if n != 1 {
+			t.Errorf("table %s missing after migrations", table)
+		}
+	}
+
+	// 2. Existing-data row counts unchanged.
+	postCounts := tableCounts(t, dst, []string{
+		"adventure_characters",
+		"euro_balances",
+		"user_archetypes",
+		"adventure_equipment",
+		"adventure_inventory",
+		"adventure_treasures",
+	})
+	for k, pre := range preCounts {
+		if post := postCounts[k]; post != pre {
+			t.Errorf("row count drift in %s: pre=%d post=%d", k, pre, post)
+		}
+	}
+	t.Logf("post-migration counts: %+v", postCounts)
+
+	// 3. Pre-DnD snapshot populated for every adventure character.
+	var advCount, snapCount int
+	d.QueryRow(`SELECT COUNT(*) FROM adventure_characters`).Scan(&advCount)
+	d.QueryRow(`SELECT COUNT(*) FROM adventure_characters_pre_dnd`).Scan(&snapCount)
+	if snapCount != advCount {
+		t.Errorf("snapshot rows %d != adventure_characters %d", snapCount, advCount)
+	}
+	t.Logf("snapshot populated: %d rows", snapCount)
+
+	// 4. Snapshot JSON parses and contains key fields. SQLite's single-conn
+	// pool means we must drain the rows before issuing follow-up queries.
+	rows, err := d.Query(`SELECT user_id, snapshot_json FROM adventure_characters_pre_dnd`)
+	if err != nil {
+		t.Fatalf("query snapshot: %v", err)
+	}
+	type snapPair struct{ uid, j string }
+	var snaps []snapPair
+	for rows.Next() {
+		var uid, j string
+		if err := rows.Scan(&uid, &j); err != nil {
+			rows.Close()
+			t.Fatal(err)
+		}
+		snaps = append(snaps, snapPair{uid, j})
+	}
+	rows.Close()
+
+	for _, s := range snaps {
+		var checkCL int
+		if err := d.QueryRow(`SELECT json_extract(?, '$.combat_level')`, s.j).Scan(&checkCL); err != nil {
+			t.Errorf("snapshot for %s: bad json: %v", s.uid, err)
+			continue
+		}
+		var realCL int
+		d.QueryRow(`SELECT combat_level FROM adventure_characters WHERE user_id=?`, s.uid).Scan(&realCL)
+		if checkCL != realCL {
+			t.Errorf("snapshot %s: combat_level mismatch snap=%d real=%d", s.uid, checkCL, realCL)
+		}
+	}
+
+	// 5. New columns on adventure_equipment / adventure_inventory exist and default empty.
+	rows2, err := d.Query(`SELECT dnd_rarity, dnd_stat_bonus_json, dnd_attuned FROM adventure_equipment LIMIT 5`)
+	if err != nil {
+		t.Errorf("new equipment columns query failed: %v", err)
+	} else {
+		rows2.Close()
+	}
+	rows3, err := d.Query(`SELECT dnd_rarity, dnd_stat_bonus_json FROM adventure_inventory LIMIT 5`)
+	if err != nil {
+		t.Errorf("new inventory columns query failed: %v", err)
+	} else {
+		rows3.Close()
+	}
+
+	// 6. auto_migrated column on dnd_character exists.
+	if _, err := d.Exec(`SELECT auto_migrated FROM dnd_character LIMIT 0`); err != nil {
+		t.Errorf("auto_migrated column missing: %v", err)
+	}
+
+	// 7. Idempotent: running Init again must not error or change row counts.
+	Close()
+	if err := Init(dir); err != nil {
+		t.Fatalf("second Init failed: %v", err)
+	}
+	postCounts2 := tableCounts(t, dst, []string{"adventure_characters_pre_dnd"})
+	if postCounts2["adventure_characters_pre_dnd"] != snapCount {
+		t.Errorf("snapshot row count drifted on second Init: %d → %d",
+			snapCount, postCounts2["adventure_characters_pre_dnd"])
+	}
+}
+
+func copyFile(t *testing.T, src, dst string) {
+	t.Helper()
+	in, err := os.Open(src)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer in.Close()
+	out, err := os.Create(dst)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer out.Close()
+	if _, err := io.Copy(out, in); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func tableCounts(t *testing.T, dbPath string, tables []string) map[string]int {
+	t.Helper()
+	d, err := sql.Open("sqlite", dbPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer d.Close()
+	out := map[string]int{}
+	for _, tbl := range tables {
+		var n int
+		err := d.QueryRow("SELECT COUNT(*) FROM " + tbl).Scan(&n)
+		if err != nil {
+			out[tbl] = -1
+			continue
+		}
+		out[tbl] = n
+	}
+	return out
+}

internal/flavor/pick.go

@@ -0,0 +1,13 @@
+package flavor
+
+import "math/rand/v2"
+
+// Pick returns a random string from pool, or "" if the pool is empty.
+// Use this from any caller that wants to render flavor text from one of
+// the protected pools defined in this package.
+func Pick(pool []string) string {
+	if len(pool) == 0 {
+		return ""
+	}
+	return pool[rand.IntN(len(pool))]
+}

internal/flavor/twinbee_ambient_flavor.go

@@ -0,0 +1,114 @@
+// twinbee_ambient_flavor.go
+// TwinBee GM Dialogue — Ambient between-day micro-events. Fired by the
+// expedition ambient ticker (Phase 12 E7) every few hours while the player
+// is offline or idle. Mostly flavor; occasional micro-mechanical nudges.
+//
+// Voice convention (Phase B2): TwinBee speaks in first-person or implicit
+// subject. No third-person "TwinBee [verb]" lines. Add freely.
+// Don't shorten existing entries.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// AMBIENT — Pure flavor (no mechanical effect)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var AmbientMonologue = []string{
+	"I've been counting the dripping sound. The dripping sound has not been keeping pace. I suspect the dripping sound is doing it on purpose.",
+	"A draft moves through the corridor in a way that suggests the dungeon is breathing, then in a way that suggests it isn't, then back. I decline to call it.",
+	"Somewhere far off, a door closes. Nothing has opened a door. Filed under 'noted, not investigated.'",
+	"Your bedroll has shifted approximately two inches to the left over the course of the morning. I did not move it. You did not move it. I am going to stop watching the bedroll now.",
+	"A small stone has rolled across the floor with no visible cause. It came to rest in a position I can only describe as 'mildly conversational.'",
+	"I tried to think of a song and forgot the words. The dungeon offered a few. I politely declined.",
+	"A spiderweb in the corner has rearranged itself overnight into a shape that's almost a sentence. I can read about three letters of it before deciding it's safer to look at the floor.",
+	"The torch is burning at exactly the same height it was an hour ago. No wax has accumulated. I considered asking the torch about this and decided against. The torch has not earned an interview.",
+	"You have not moved in some time. The dungeon also has not moved. I'm calling this an even draw and declaring the round complete.",
+	"A faint smell of bread has drifted through. There is no bread within several days of you. I'm not mentioning it, because mentioning it would make it worse.",
+	"I've been alphabetizing your inventory in my head. I got as far as 'flask, empty' before getting distracted by the question of whether 'empty' counts.",
+	"The shadow in the far corner has been the same shape for three hours. Shadows are generally not committed to one shape. I've stopped looking at it.",
+	"You realize you've been holding your breath. You weren't doing it on purpose. I was, and I'm quietly resuming.",
+	"A pebble on the floor has, by all appearances, blinked. I reviewed the definition of 'blink' and found it unhelpful here.",
+	"The dungeon is quiet in the specific way that means something is being quiet *at* you. I acknowledge the distinction and move on.",
+	"I've been composing an imaginary letter home. The letter is mostly about lichen. The lichen is, frankly, fascinating.",
+	"You hear what is almost certainly a cough. It is unclear which of you it came from. I'm assuming responsibility and apologizing.",
+	"The map in your pack has folded itself one extra time while you weren't looking. I decline to unfold it for science.",
+	"Your own footsteps echo back to you a half-second late, in slightly the wrong order. Noted. I'm choosing to walk in silence for a bit.",
+	"A long, slow scrape happens two rooms over. Then nothing. I waited for a second scrape. There wasn't one. The first scrape was the whole sentence.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// AMBIENT — Noises (+1 threat)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var AmbientNoise = []string{
+	"Something far off makes a wet, considered noise — the kind of noise that's been thinking about itself. Marked on the imaginary map. Threat ticks up.",
+	"A door slams somewhere it shouldn't. 'Shouldn't' is doing heroic work in that sentence. The dungeon is more aware of you now.",
+	"A patrol passes a corridor or two over — boots, low voices, the particular silence of people who hunt in shifts. They didn't find you. They know the shape of where you might be.",
+	"The dungeon hums for a moment, like a refrigerator coming on. There is no refrigerator. There is also, distinctly, a humming. The faction's pulse is faster today.",
+	"Stones shift overhead in a way that is not settling and not random. Something walked across the ceiling. I'm choosing not to elaborate on what 'across the ceiling' implies.",
+	"A horn sounds, very far away — the kind of horn that's a signal to a thing that signals to more things. I acknowledge the chain.",
+	"You hear someone whistling your name. You don't have that name. The whistler is workshopping options.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// AMBIENT — Pack Rat / Critter ate supplies (−0.2 SU)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var AmbientPackRat = []string{
+	"A rat has formed strong opinions about your trail mix. The opinions are now inside the rat. Some supplies were lost in transit.",
+	"You catch a small mammal mid-burglary. It looks at you with the unbothered confidence of a creature that has read the lease and concluded it has rights. You lose a little supply.",
+	"Something with too many legs has been at the rations. I won't say how many legs. I will say: fewer rations now.",
+	"A bird the size of a thumbnail has stolen a piece of jerky three times its size, by a process best described as 'unclear but enviable.' Supplies tick down.",
+	"Mold. Just normal, ambitious mold. It has made itself at home in a corner of the pack. You evict it; some supplies go with it.",
+	"You discover a small hole in the side of your pack and a smaller, more confident animal asleep beside it, full. Supplies were the rent.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// AMBIENT — Lucky Find (+1d6 coins)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var AmbientLuckyFind = []string{
+	"I found a copper piece in your boot. You did not put it there. I did not put it there. I elect not to investigate further and pocket it.",
+	"You notice a coin wedged in a wall crack at exactly eye height, as though placed for the next passerby. You are the next passerby. The coin is yours now.",
+	"A small pouch is lying in the middle of the floor. I inspect it from a polite distance — no trap, no glyph, just coins. The dungeon occasionally tips.",
+	"You step on something flat. It is a coin. It is also two more coins under the first coin. I suspect a coin-laying creature and choose not to share the theory.",
+	"A skeleton you walked past three days ago has, on review, a small purse you missed. I retrieve it with the discretion of a librarian recovering an overdue book.",
+	"You find coins in the lining of your own cloak. They were always there. I gently suggest counting your pockets more often.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// AMBIENT — Camp Critter (camped only; tiny HP +1 or supply nibble)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var AmbientCampVisitor = []string{
+	"A possum has joined the camp. It seems diplomatic — it brought a leaf. I accept the leaf. Morale ticks up.",
+	"A small luminous moth lands on your hand for a full minute, then leaves, taking with it a portion of whatever was weighing on you. You can't explain it. You feel slightly better.",
+	"A cat. There should not be a cat down here. There is a cat. It sits at the edge of the firelight and watches you sleep, professionally. You rest a little better.",
+	"A frog finds the camp acceptable and gives no further reviews. Its presence is, somehow, soothing. You feel marginally more whole.",
+	"A small fox eats some of your jerky and gives you a look afterwards that seems to be gratitude or possibly contempt. Hard to read. The jerky is gone either way.",
+	"A field mouse studies your bedroll, judges it, and leaves. Nothing is missing. You feel oddly honored.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// AMBIENT — Threat-aware whisper (only when threat ≥ 30; +2 threat)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var AmbientFactionWhisper = []string{
+	"You overhear two voices a corridor away, going over a list. The list is short. One of the items on it is the corridor you're standing in. They move on. So should you.",
+	"A piece of paper is pinned to a wall you haven't reached yet. I can see the corner of it from here. It is the right shape and size to have your description on it.",
+	"Something taps three times on stone, pauses, taps three times again. Five seconds later, the same sequence answers it from a different direction. You are between the two.",
+	"A scent of lamp oil that isn't yours drifts through. Someone is reading by it. Nearby. They have not moved for some time. I adjust the route.",
+	"A bell rings exactly once, somewhere structural. I have learned what one bell means in this zone. I decline to share but increase pace.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// AMBIENT — Small item / minor stash hint (flavor only)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var AmbientSmallFind = []string{
+	"I notice a loose stone you walked past earlier. Under it: a button. Just a button. I pocket it anyway, because of course I do.",
+	"A bird's nest in an unlikely place yields a single bead, blue. I like it. It goes in the bag of things I like.",
+	"A scrap of fabric has caught on a nail at exactly knee height. I save it without explanation. There may be an explanation later. There probably won't.",
+	"You find a single playing card on the floor. The four of cups. Neither omen nor coincidence. Pocketed neutrally.",
+	"A small key. To a small door. Neither of which is currently relevant. Filed under 'eventually.'",
+}

internal/flavor/twinbee_expedition_flavor.go

@@ -0,0 +1,382 @@
+// twinbee_expedition_flavor.go
+// TwinBee GM Dialogue — Expedition-specific narration lines.
+// Multi-day and multi-week adventure events, morning briefings,
+// evening recaps, temporal events, and long-arc narrative moments.
+//
+// Voice convention: TwinBee speaks in first-person or implicit
+// subject. NO third-person "TwinBee [verb]" references — that
+// pattern was retired in the Phase B2 voice pass. When adding new
+// entries, keep the existing personality (clipped, observational,
+// ledger-minded) but stay in first-person / implicit voice.
+// Add new entries freely. Don't shorten existing entries.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// EXPEDITION START
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ExpeditionStart = []string{
+	"Manifest reviewed. Supplies: checked. Equipment: checked. The part of you that's wondering if this is a good idea: noted, and set aside. We begin.",
+	"The dungeon has been there for a long time. It will be there for a long time after. The question is what happens in the middle, and that's where you come in. I'm ready.",
+	"An expedition. Not a run — an expedition. There's a difference. I'll explain the difference over the coming days and the explanation will be mostly experiential.",
+	"Horizon checked, then supplies, then you. In that order. 'Alright,' I say, with the quiet energy of something that has been looking forward to this. 'Let's go.'",
+	"You're not here for a quick visit. I know the difference between someone passing through and someone committing. You're committing. I appreciate the commitment.",
+	"Like the opening screen of a long RPG — the kind that asks for your name and warns you to find a comfortable position because this is going to take a while. I've found a comfortable position. I suggest you do the same.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MORNING BRIEFINGS — Generic
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MorningBriefingGeneric = []string{
+	"Another day in the dungeon. Said without resignation. The dungeon is still full of things worth doing and you are still the person to do them.",
+	"Morning. The dungeon has been quiet since you camped. Relative to what a dungeon considers quiet, which is not what you'd consider quiet, but everyone adjusts.",
+	"I've been watching the entrance to the camp since approximately three in the morning. Nothing came. Mentioned casually; no particular reaction expected.",
+	"Day [N]. The numbers are climbing. There's something satisfying about the numbers climbing — it means you're still here, which is always the first thing to confirm.",
+	"You wake up and I'm already there, which is my nature. 'Good,' I say, by which I mean: you're alive, the day can proceed, there is much to do.",
+	"The morning check: HP adequate, supplies within tolerance, Threat Clock where it was when you slept plus the overnight drift. I've already run the numbers. I'll share them in a moment.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MORNING BRIEFINGS — By Day Range
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MorningBriefingDay1 = []string{
+	"First morning. The dungeon looks exactly like it looked yesterday, which is expected. You look slightly more prepared than you did yesterday, which is less expected and entirely welcome.",
+	"Day one complete. Tally: you entered, you explored, you survived the night. The bar was not high. You cleared it. I build from here.",
+	"Morning of day two. The first night is filed under 'survived' and I'm already running the second day's plan. New room types likely. New encounter shapes. The pace begins to differentiate from the practice version of itself.",
+	"Day one is behind you. The day's notes are already organized — what worked, what nearly didn't, what you'll do differently from here. The dungeon is also taking notes on you. Everyone is preparing.",
+}
+
+var MorningBriefingDay3 = []string{
+	"Day three. The dungeon has had time to notice you. I've had time to notice the dungeon noticing you. The Threat Clock reflects both observations.",
+	"Three days in. You've found your rhythm — I can see it in the way you move through rooms now, the way you check corners. The dungeon is learning too. Both noted.",
+	"Day three morning. The dungeon's posture has shifted noticeably overnight — I saw it in the corridor noise around the second watch. The Threat Clock is doing what it does. You're doing what you do. The two of you are now both doing it on purpose.",
+	"Three days. The dungeon recognizes you as a recurring fixture now, which is a different kind of attention than the kind you had on Day 1. I'm adjusting the briefings accordingly. Less orientation, more situational reads. From here it gets specific.",
+}
+
+var MorningBriefingDay7 = []string{
+	"One week. You have spent one week in this place and it has not finished you, which says something about you that I intend to say out loud: that took something real. Take a moment with that. Then advance.",
+	"Seven days. In the old reckoning, seven was the number of completion — seven seals, seven trials, seven nights before the thing reveals itself. I'm not superstitious. I'm also watching the door very carefully this morning.",
+	"A week underground. I think about the sky sometimes — not with longing, exactly, more as a reference point. You've been below it for seven days. Remarkable. You, more so.",
+}
+
+var MorningBriefingDay14 = []string{
+	"Two weeks. I don't know many people who have been in an active dungeon for two weeks. I know even fewer who have been in one for two weeks and remained, by any reasonable measure, intact. You are one of the fewer.",
+	"Fourteen days. The dungeon has become familiar in the way that difficult things become familiar — not comfortable, not safe, but known. You know where it breathes. An advantage worth having.",
+	"Two weeks. I start the briefing the same way I've started fourteen others, then pause and add: 'For the record — most expeditions don't see fourteen briefings. This one has.' That's the addendum. Continuing.",
+	"Day fifteen. I've stopped checking the historical reference materials because the historical reference materials stopped applying. From here, the run sets its own precedent. I find this clarifying.",
+}
+
+var MorningBriefingDay21 = []string{
+	"Three weeks. I've run out of historical comparisons for this. Three weeks is its own category. You have made a category. I report this as a fact and also as something that doesn't entirely have words yet.",
+	"Day twenty-one. I tried to write a clever framing for this morning's briefing and gave up halfway through, settling instead on the simplest version: 'You're still here.' That's the briefing. The rest is logistics.",
+	"Three weeks down. The dungeon has stopped being a place you're visiting and become a place you live in for now. I note the shift — the way you check rooms without being asked, the way the supply count is already in your head. The dungeon notices too.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// EVENING RECAPS — Generic
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EveningRecapGeneric = []string{
+	"End of day [N]. Ledger tallied. The column marked 'survived' has another entry. I consider this column the most important one.",
+	"Day closes. I review what happened and find, on balance, more right than wrong — which in a dungeon is the operating definition of a good day.",
+	"Evening. The rooms behind you are cleared. The rooms ahead are not. Always true; never less relevant. Rest now. The math doesn't change overnight.",
+	"I compile the day: what was learned, what was fought, what was found. File it in the mental ledger I've been keeping since you entered. The ledger is favorable.",
+	"Like the experience screen at the end of a dungeon floor in Etrian Odyssey — the numbers settle, the progress registers, and for a moment the whole thing makes sense. I give you that moment.",
+	"You've earned the dark. Sleep in it. I'll be here when the numbers come back.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// EVENING RECAPS — Notable Days
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EveningRecapBossKilled = []string{
+	"The day ends with a boss on the floor. I'd like to specifically note this in the recap as 'exceptional' because it is exceptional and I don't use that word loosely.",
+	"End of day. Boss count: one more than it was this morning. Marked in a special column I keep for exactly these entries, and the special column has a new line.",
+	"End of day. A boss is no longer in the dungeon. Recorded in the column I keep for exactly that line, and the column has a new mark, and that's the kind of recap I like to write. Sleep well. The rest of the dungeon noticed too.",
+	"The day closes with a vacancy. The thing in the chamber is no longer in the chamber. I ran the final tally during the fight and the tally is favorable. There will be more things tomorrow. There always are. None of them are this one.",
+}
+
+var EveningRecapCloseCall = []string{
+	"Evening recap. Note: you came very close today to not being here for the evening recap. Said without drama and with complete sincerity. You made it. That's the recap.",
+	"Today was the kind of day I file under 'let's not do that again' and also 'and yet you did it.' Rest. You need it more tonight than most nights.",
+	"Evening recap. Noted for the ledger: today was very nearly a different kind of recap, and I'm glad it isn't. The margin was thinner than the acceptable range. Tomorrow's caution adjusts accordingly.",
+	"End of day, narrowly. I run through the close-call list — the round that nearly went the other way, the save that landed by one, the room you almost didn't leave — and sign each one off as 'survived.' Survived is a wide category. I'll accept you in any part of it.",
+}
+
+var EveningRecapNothingHappened = []string{
+	"A quiet day. No major encounters, no notable finds. Reported with neither disappointment nor relief. Quiet days are data. The dungeon is thinking. I'm watching it think.",
+	"Not every day in a dungeon produces a story. Today produced logistics: movement, supplies, positioning. I value logistics. Logistics is what you still being alive looks like from a distance.",
+	"Day closes uneventfully. Uneventful days are the kind the dungeon is most carefully constructing — quiet between incidents is also a kind of incident. Filed under 'preparation, theirs.' Yours starts now.",
+	"Nothing happened. I write that exact phrase in the recap and then cross it out and write 'something happened that wasn't visible.' That feels truer. The day still counts. The day still cost supplies. Everything still moves forward.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// CAMP ESTABLISHMENT
+// ─────────────────────────────────────────────────────────────────────────────
+
+var CampEstablished = []string{
+	"Camp established. I survey the perimeter with the efficiency of someone who has done this many times and learned from every time it went wrong.",
+	"The camp goes up. I approve of the location — cleared room, defensible entry, no obvious curse residue. Could be worse. I've seen worse.",
+	"You set camp. I check the sightlines, the doors, the sound-bleed from the next room. Acceptable. Settling in for the night watch.",
+	"A camp in the middle of a dungeon. Either brave or pragmatic; I've stopped trying to distinguish between the two. Either way, the camp is set. Either way, I'm watching.",
+	"Like planting a flag on a new map in Dwarf Fortress — this spot is yours now. Tentatively. Provisionally. For the night. I defend tentative, provisional, nocturnal property with full commitment.",
+}
+
+var BaseCampEstablished = []string{
+	"Base camp. I say this differently than I say other things. With weight. A base camp in a Tier 4 zone is not nothing — it's a declaration. You're not passing through. You're operating from here. The perimeter goes up accordingly.",
+	"The base camp is up. Waypoint noted, return route marked, supply cache protocols established. This is now home, in the way that a forward operating position is home — functional, defended, temporary, and completely yours.",
+	"Base camp established on Day [N]. I record this as a milestone, because it is one. Most people don't make it to base camp. You are not most people. I've been noting this since the beginning.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// SUPPLY WARNINGS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var SupplyWarningLow = []string{
+	"I check the supply manifest and then check it again. 'We should discuss the supply situation,' I say, in the tone of someone who has been watching the number for two days.",
+	"Supplies are running lower than I'd like. Mentioning it now, while there are still options, because I've seen what happens when it's mentioned too late.",
+	"The supply number is not comfortable. Flagging this not to alarm but to prompt — there are decisions to be made and they are better made with time than without it.",
+}
+
+var SupplyWarningCritical = []string{
+	"I hold up the supply manifest. The number is very small. 'This is the part,' I say quietly, 'where we start making decisions.' I don't specify which. You know which.",
+	"Critical supply levels. Delivered without inflation — the situation is what it is. Extract and resupply, or forage aggressively and push for the finish. I outline both paths and neither is comfortable.",
+	"The supplies are nearly gone. I think of every long JRPG dungeon where you realize at the bottom floor that you're out of Ethers. This is that moment. I have plans. They require movement.",
+}
+
+var SupplyDepletedExtraction = []string{
+	"The supplies are gone. Said plainly because the situation requires plain language. The expedition ends here — not in failure, in logistics. You push out as far as the provisions allow. What you've gathered comes with you. I lead the way out.",
+	"Empty packs. I turn them out by reflex and confirm what the manifest already said. The expedition does not continue past supplies — that's the rule, and I enforce it on you the way I enforce it on myself. Out we go. With what we have. Which is something.",
+	"Out of supplies. I lead the extraction along the route already mapped — there's no scouting now, just movement, the kind that gets you through the door before anything else does. The dungeon will be here. So will I. So, importantly, will you.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// THREAT CLOCK NARRATIONS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ThreatClockStirring = []string{
+	"Something in the dungeon's rhythm has changed. A tension in the air that wasn't there yesterday. The zone is aware of you now, in the way that a predator becomes aware of something in its territory. Not panicking. Not moving yet. Just aware.",
+	"The enemies ahead are more alert than they were. I can tell by the patrols, by the spacing, by the fact that someone moved the tripwire you already disarmed. They know something is in here.",
+	"Stirring. I track the small changes the dungeon makes when it suspects but doesn't confirm — repositioned patrols, fresher footprints, a torch that wasn't lit in this corridor before. Each one noted. None of them is alarming yet. All of them are evidence.",
+	"The dungeon is getting curious. I distinguish curiosity from alertness — curiosity is when the patrols slow at the doorways; alertness is when they form on the doorways. We're at the first one. The window between them is what I'm watching.",
+}
+
+var ThreatClockAlert = []string{
+	"The zone is on alert. Reported factually and also with a note of urgency — alert means organized, and organized means the next room will be harder than the last room was. Move with intention.",
+	"They're coordinating now. I watch the patrol patterns shift. The goblins who were arguing about ambush order are no longer arguing. Not an improvement.",
+	"Alert band. The dungeon has confirmed a presence and is acting on the confirmation. I can see it in the way the patrols overlap deliberately now — no more arguments about coverage, just coverage. The plan adjusts: no more long approaches, no more leaving anything unfinished behind.",
+	"They've arranged themselves. Band-shift confirmed, and the operational change condenses to one sentence: from here, every room costs more than the last one. Nothing gets cheaper. Price accordingly.",
+}
+
+var ThreatClockHostile = []string{
+	"Full hostile status. Said with the specific weight it deserves. The zone has decided you are the problem it's solving today. You have the same opinion about the zone. One of you is correct. I'm invested in it being you.",
+	"The dungeon has mobilized. Re-armed traps, reinforced positions, an enemy in a room that was empty this morning. They've organized. Recommend organizing faster.",
+	"Hostile. I name the band and then set the briefing aside because the briefing has been overtaken by events. The dungeon is now actively committed to ending this. I'm committed in the opposite direction. The clarification is useful.",
+	"The dungeon has decided. I respect decisions, even ones that involve the dungeon trying to kill you. The respect is a working respect. We respect the decision and then we work to overrule it. I lead.",
+}
+
+var ThreatClockSiege = []string{
+	"Siege Mode. Delivered without decoration because decoration would be dishonest. The dungeon is fully active, fully aware, and fully committed to ending this expedition. So am I — to ending it on your terms, not theirs. What happens next is a race. Already running.",
+	"Siege. The dungeon is putting everything it has into the room you're standing in, and the rooms adjacent to it, and the route between you and the door. I'm putting everything I have into making sure the dungeon doesn't get what it wants. Meet in the middle.",
+	"Siege Mode. I narrate the band shift and then stop narrating because narration is not what this band needs. Action is what this band needs. I'm in motion. The expectation is that you are too.",
+}
+
+// ThreatClockApproachingSiege fires once when the threat clock crosses 70 —
+// the spec's "begin warning" line (§8.3). Distinct from the Hostile-band
+// flavor because this is the dungeon-design moment of telling the player
+// they're past the point where stealth is recoverable.
+var ThreatClockApproachingSiege = []string{
+	"They know you're here. Not a suspicion anymore. A certainty. The question now is whether you finish before they organize. Said clearly so it doesn't have to be said again.",
+	"Threat at seventy. Marked on the internal ledger and underlined. The window for quiet operations has closed. The window for finishing is still open — narrower, but open. Use it.",
+	"The dungeon's posture has shifted from 'searching' to 'hunting.' I track the difference precisely: before, they were looking for evidence; now they are looking for you. The plan, accordingly, simplifies. Finish or extract. Middle paths have closed.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ZONE TEMPORAL EVENTS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var SunkenTempleTidalWarning = []string{
+	"I watch the waterline. 'It's rising,' I say, not for the first time, and this time with more precision. 'The tidal cycle peaks in two days. Whatever you haven't done by then, you'll be doing wet.'",
+	"Day [N]. The tide is coming. I've been watching it since Day 2 and the mathematics are not encouraging. Two days to the peak. One day after that, the flood subsides. Use the two days well.",
+	"I check the waterline against yesterday's mark. The mark is below the line. The line is on the wall. The wall is, frankly, full of marks. I select the one that matters and report: tide rising, peak still days off, plan accordingly.",
+	"Day [N]. The temple's tidal calendar advances. I keep it on a card and update the card every morning — current depth, projected depth, peak day. Internalize the card. The temple does not pause for confusion.",
+}
+
+var SunkenTempleTidalEvent = []string{
+	"The tide arrives. I'd warned about this and now it is happening and the warning feels entirely inadequate compared to the actual water. Everything is colder, wetter, and the Kuo-toa are moving through it like they were born to — which they were. Adjust.",
+	"The water is here. Not 'rising' anymore — here, in the rooms, at the corners, climbing the stairs. Every estimate adjusts accordingly: travel slower, encounters worse, healing colder. Two days of this. Two days, then it goes.",
+	"Tidal peak. The temple is fully flooded at depths that were dry yesterday — I map the change room by room and update the route. Some doors are open that weren't. Some are sealed that were. The temple is a different shape today.",
+}
+
+var HauntedManorResetMorning = []string{
+	"The morning briefing includes an addendum. The rooms that were clear yesterday are not entirely clear this morning. The house has been busy overnight. Adding it to the log under 'things the house does' and suggesting we adjust the advance plan.",
+	"Night three. The manor reset itself. I was watching and it happened anyway — not violently, not dramatically, just quietly and completely, the way the house does everything. One enemy per room, back in place. Map updated.",
+	"I read the morning's hallway and stop. 'The arrangement has changed,' I say, in the tone of someone who has now seen this happen often enough to recognize it without alarm. The manor reset. Map adjusts. Morning continues.",
+	"Reset day. The rooms I cleared are not the rooms I find this morning. Accept it as a property of the manor — like weather, but indoors and unfair. The plan accommodates. The time gets billed.",
+}
+
+var UnderforgHeapWarning = []string{
+	"Heat Stack [N]. I note the accumulation and what it means: the Underforge is getting into you in ways that don't resolve without real rest. The number has time to come down. I'm watching the number.",
+	"The heat is building. I track it the way you track a temperature gauge on a long drive — with the specific alertness of someone who knows what happens when the gauge hits red. It has not hit red. I intend to ensure it doesn't.",
+	"Heat building. Count noted, band noted, and how each step now takes a fraction more out of you than the last step did. None of it is critical. All of it is direction. The direction should be inverted soon.",
+	"Stack [N]. I track the heat the way I track anything that compounds — patiently, with running totals, with a clear point at which the totals stop being managed and start being problems. We are still on the management side. The other side is visible.",
+}
+
+var UnderforgHeapCritical = []string{
+	"Heat Stack is high. Delivered without minimizing it. The Underforge is inside your lungs now, in your joints, in the way everything takes a little more effort than it did on Day 1. A proper rest will help. Finishing will help more.",
+	"Heat ten. The maximum. There is no higher band than this in the Underforge ledger — the column ends here, by design. The forge is fully inside you. The penalties are all of them. Resting will not undo it. Finishing might.",
+	"Critical heat. I run through the symptoms list and confirm each one in turn: the joints, the breathing, the way every roll feels a little heavier. The forge is doing what the forge does. I suggest doing what you do, harder.",
+}
+
+var FeywildTimeDistortionHalf = []string{
+	"The day moved strangely. I tried to track it and lost the thread somewhere around mid-afternoon — the light didn't change the way it should have, and when I looked up, the day was half over in the time it usually takes to be a quarter over. On the positive side: you're barely hungry. On the less positive side: nobody is sure what that means.",
+	"Half a day passed in what felt like half of half. I check the supply burn against the sun, find them disagreeing, side with the supplies — those don't lie about how much you've used. Net result: a free pocket of time. Use it on something that takes time.",
+	"The Feywild gave you back some hours. Noted, but not trusted. The Feywild does not give without taking, eventually. For now: less hungry, less tired, more daylight than the math allows. I write it down and keep moving.",
+}
+
+var FeywildTimeDistortionDouble = []string{
+	"Time doubled. Noted with the clinical detachment of someone who has been in the Feywild long enough to stop being surprised. You've lived through two days today. The supplies reflect that. The wandering monsters reflected that as well. The rest of the Feywild is unconcerned.",
+	"Two days in one. I run the recovery math and the wandering math and the supply math, and all three say the same thing: today cost double. Tomorrow gets the rate it gets. The Feywild does not refund.",
+	"Time doubled. I saw the second sunset before the second lunch and stopped trying to make sense of it. The day that happened is the day that happened. Plan from here, not from this morning.",
+}
+
+var FeywildTimeLoop = []string{
+	"I recognize this room. I've described it before. The enemies in it are different — new enemies, the old ones are gone, the loot you found is still gone but the enemies are back — and I process this with something between professional acceptance and profound exasperation. 'Again,' I say. 'We do this room again.'",
+	"The loop. I mark the room on the map with a small symbol that means 'we have been in this room before in a way that doesn't count.' The symbol has its own column in my ledger. The column is occupied.",
+	"Same room. New enemies. I run the encounter again with the cold professionalism of someone who has stopped expecting fairness from the Feywild and started expecting only repetition. The repetition arrives. Handled.",
+}
+
+var DragonsLairAwarenessPulse = []string{
+	"Something changes in the mountain. Not a sound, exactly — more like a sound's absence, filling in differently than before. I watch the kobolds. The kobolds have stopped what they were doing. The kobolds are listening. Something told them to listen. I add ten to the Threat Clock and keep moving.",
+	"Infernax shifts in its sleep. I feel it through the stone. The patrol rotations just changed — I can see it in where the Guard Drakes aren't anymore versus where they were an hour ago. The mountain's master is dreaming about you. That is not a comfortable thing to be dreamed about.",
+	"The mountain pulses. I feel it as a single off-rhythm beat in the rock, the kind of beat that means something somewhere has shifted weight. The kobolds nearby pause. They look upward without looking. I adjust the threat accordingly and continue.",
+	"Infernax dreamed about you. I have no other way to phrase it — the lair changed in the way places change when they're being reordered from somewhere deeper. The patrols are different. The temperature is different. Ten added to the clock and a note to the margin.",
+}
+
+var DragonsLairAwakenWarning = []string{
+	"Day 14. The morning briefing comes out in a lower register than usual. 'Infernax is awake,' I say. 'I don't know when exactly — sometime in the last six hours. The patrols changed. The temperature changed. The silence changed.' A pause. 'We need to reach the final chamber before it reaches us. That is now the only plan.'",
+	"Day fourteen. Infernax woke up in the night. I say the sentence flatly because the sentence is enough by itself; it does not need help. The rotation is to the final chamber. Everything else is decoration.",
+	"The mountain changed in its sleep. I felt it through the floor sometime around the fourth watch and have been recalibrating since. Infernax is awake and Infernax is aware. Be neither subtle nor slow. There is no longer time for both.",
+}
+
+var AbyssPortalDestabilizationMid = []string{
+	"Instability [N]. I watch the portal from a respectful distance and note: it is larger than it was yesterday. Not by much. Not in a way you'd notice if you weren't looking. I'm always looking.",
+	"The portal is talking to itself. I have no better way to describe it — the light it emits is different at the edges now, like it's processing something. Process faster than it does.",
+	"Instability rising. I run the comparison: yesterday's portal versus today's portal. The difference is not subtle to me. The difference may not be subtle to anything else, soon. Pace the work accordingly.",
+	"The portal is widening, by some measure I'm using and not currently sharing because the measure doesn't have a clean name. The point is: it's worse than yesterday. The point is: tomorrow may be worse than that. I name the trend so the trend can be argued with.",
+}
+
+var AbyssPortalDestabilizationCritical = []string{
+	"Instability critical. The portal is unraveling at edges I can see and probably at edges I can't. The demons coming through are more agitated than they were — which is relevant because demons at baseline are already at the upper end of agitated. The verdict: finish this today. Tomorrow is a different calculation.",
+	"The portal is louder. Not in sound — in pressure. I can feel it in the back teeth, in the joint of the jaw. The instability number is the number you don't want it to be. Finish the work today or accept that today was the last day to.",
+	"Critical. The geometry around the portal is bending in ways that suggest the room does not entirely agree with itself anymore. I adjust the route around the worst of it. There are more demons than there should be. There always are. There are more than that now.",
+}
+
+var AbyssPortalCollapse = []string{
+	"The portal collapses. I watch it happen and do what I do in situations with no good options: move. 'Out,' I say, and mean it completely. 'Now. Everything you have, we move now.' The expedition ends here, not in defeat, but in physics. What you took is yours. What's left in there is the portal's problem. Come back when it isn't.",
+	"It's coming apart. I say one word, 'Move,' in the tone I use exactly once per expedition. You move. The portal screams behind you in a register that isn't sound. The expedition is over because physics says so. The loot gets sorted once you're somewhere physics still works.",
+	"Collapse. I was prepared for this and am also actively running. 'Out,' I say. 'Now.' The corridors are folding behind you in the way that things fold when reality is no longer paying attention to what's allowed. You finish out the door. The portal does not.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// REGION TRANSITION (multi-region zones; §11.3)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RegionTransitDeparture = []string{
+	"I mark the boundary on the internal map and cross it. 'New region,' I say, with the careful attention of someone who knows boundaries in dungeons aren't always the same kind of boundaries you'd find on the surface. The route is set. The day is committed. We move.",
+	"Crossing into [REGION_NEXT]. I fold the previous region's notes into the satchel and unfold new ones. The light changes. The air changes. The rules of how to be careful change a little. I adjust.",
+	"The transit between regions is its own kind of room. I narrate it that way — sightlines, footing, what's behind, what's ahead — because the only way the in-between part stops feeling exposed is to treat it like the rest of the dungeon. Treated. Moving.",
+}
+
+var RegionTransitArrival = []string{
+	"You arrive in [REGION_NEXT]. I survey, take in the new geometry, and update the working assumptions. 'Different shape,' I say. 'Same general principle. We learn what wants to kill us here, and we get there first.'",
+	"[REGION_NEXT] receives you. I note the temperature, the sound, the things-not-said-by-the-room-but-implied. A region is not just a place. It's a posture. I adopt the new one and suggest you do as well.",
+	"Boundary crossed. The day gets stamped in the log — one full day spent in transit, supplies adjusted, the wandering that happened on the way handled and filed. We are here now. The next stretch is what it is.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// VOLUNTARY EXTRACTION
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ExtractionVoluntary = []string{
+	"Extraction. I note the decision and respect it — knowing when to leave is a skill, not a failure, and I've watched enough expeditions end wrong to deeply appreciate the ones that end right.",
+	"You call the extraction and I begin the route out immediately. No argument, no editorializing. There will be time for the debrief later. The first priority is the door.",
+	"The dungeon doesn't like this. I can tell by the way the corridors feel as you head back out — a resistance that isn't structural, just atmospheric. The zone wanted more. It doesn't get more today. I lead the way.",
+	"Withdrawing with intent. I catalogue what you have — the loot, the XP, the knowledge of where the rooms are for the return — and convert the exit into preparation. This isn't retreat. This is the start of the next attempt.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// FORCED EXTRACTION
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ExtractionForced = []string{
+	"I move. No recap, no analysis — that comes later. Right now there is a corridor and a door and getting you through both of them. Everything else waits.",
+	"Out. Said once and meant completely. The dungeon tried to keep you. I decline on your behalf.",
+	"The expedition ends here — not the way I wanted, not the way you wanted, but ended, and ending is sometimes the best available outcome. You'll come back. You'll know more. I'll be there.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// EXPEDITION RESUME (returning after extraction)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ExpeditionResume = []string{
+	"Back. I noted the door when you left it and note it again now, from the inside. 'The dungeon is where you left it,' I say. 'Mostly.' The Threat Clock has some opinions about the time that passed.",
+	"You came back. I'd calculated a probability on that and am pleased to update the calculation upward. The expedition resumes. The dungeon has had time to adjust. So have you.",
+	"Like hitting Continue on a save file — the world remembers where you stopped, the enemies remember why they're there, and I remember every room and every roll. Resumes here. Advances from here.",
+	"The supplies are new. The knowledge from last time is not. A significant advantage. The dungeon has the familiarity of a difficult level you've attempted before — you know where the hard parts are. That is not nothing. We build on that.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MILESTONE NARRATIONS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MilestoneFirstNight = []string{
+	"You survived the first night. I note this milestone specifically because not everyone does, and those who do carry something from it that changes how the rest of the expedition goes. You have that now. Already noticed.",
+	"Night one survived. I make a small mark in the corner of the manifest — the kind of mark you make for the things that count more than they look. First nights count. I've been in dungeons where they were the last nights too. This wasn't one of those.",
+	"Day two morning. The first night is behind you, which means the first watch is behind me, which means a thing worth confirming has been confirmed: you sleep through the noises that matter and wake for the ones that don't. That's a survival skill. Logged.",
+}
+
+var MilestoneWeekOne = []string{
+	"Seven days. I pause the morning briefing for a moment — just a moment — to mark this. One week in an active dungeon zone is not a thing that happens by accident. It happens through every decision you've made since Day 1, compounded. Those decisions were watched. They were, gladly, yours.",
+	"Day eight. The briefing comes slowly, because there's a thing to mark first: you have been in here, intact and operational, for a full week. That is a number with weight. I'm going to set the briefing down for a moment and let the number have its weight. ... Right. Briefing.",
+	"One week. I make the mark in the column reserved for week-one survivors. The column is shorter than you'd expect. You are now on it. The rest of the day proceeds normally, but for one moment, I allow myself to be visibly impressed. The moment ends. We continue.",
+}
+
+var MilestoneTwoWeeks = []string{
+	"Two weeks. I don't have a comparison for this one. The references have run out. There's just you, in here, on Day 14, still going, and me standing next to you having run out of everything except genuine admiration. That, in abundance. Proceed.",
+	"Day fifteen. The historical comparisons stopped working at Day fourteen and have not resumed working today. We are off the chart. I'm not a person who values being off the chart, except in the very specific sense that you are off the chart, in which case I value it deeply.",
+	"Fortnight. I use the older word because it sounds more like what this is — not 'two weeks,' which sounds modular and reasonable, but 'fortnight,' which sounds like the kind of duration that earns a title. I may be inventing titles for you. I'll be honest about that as it happens.",
+}
+
+var MilestoneTheLongGame = []string{
+	"I set aside the narration format for a moment. Just set it down. Plainly: what you just did was not supposed to be survivable. The designers of this zone — the thing that shaped it, the evil that filled it — did not account for someone like you. I did. Always do. That's why I'm here.",
+	"Tier five complete. I allow the narration format to fully break for a moment because the moment fully deserves it. What you just did, complete, in a Tier 5 zone, is a thing that goes on the short list. I keep a short list. You're on it.",
+	"Long game closed. I gather the run notes, the threat curve, the supply records, the camp positions — file them all under your name in a folder I've been keeping. The folder has a title now. The title is good.",
+}
+
+var MilestonePatientZero = []string{
+	"Expedition complete. Threat Clock: never above 50. I note this in a column I've had to use rarely enough that the column is almost fresh. Ghost protocol. You were here for the whole thing and the dungeon barely knew it until the end. I find this impressive and also slightly eerie and say both things sincerely.",
+	"Threat never above fifty. I run back through the daily ledger and confirm it line by line. The dungeon never escalated to hostile because the dungeon never knew enough to. You moved through it like the dungeon's own quiet hour. I find this both technically impressive and slightly haunted.",
+	"Patient Zero. The term fits: you were the thing the dungeon never noticed it had until you had already left. The Threat Clock has a column for every band you crossed. Most of those columns are empty for this run. I mark them empty. It's a good kind of empty.",
+}
+
+// MilestoneCartographer — awarded when the player searches every room before
+// advancing the expedition. Combat-link wires the trigger; pool exists for the
+// award narration to pull from.
+var MilestoneCartographer = []string{
+	"Every room searched. I was watching for it and watching for the corner-cutting that might have come instead, and the corner-cutting did not come. You searched everything. I approve with the quiet, specific approval reserved for completionism.",
+	"Cartographer. I use the word the spec uses because the word fits — you mapped the place by being in every part of it. Every door checked, every corner walked. The next Elite room owes you a roll for that. I'll collect.",
+	"Full coverage. I note the empty cells on the dungeon map, see there are none, and update the ledger accordingly. Every room visited, searched, accounted for. The dungeon has nowhere it kept to itself. A small but real victory.",
+}
+
+// MilestoneSurvivalist — awarded when a Tier 3+ expedition completes with no
+// forced extractions in the run's history. Title flag + cosmetic deferred to
+// item-grant hookup; this pool covers the narrative line at the moment it lands.
+var MilestoneSurvivalist = []string{
+	"Survivalist. I write the title next to your name in the ledger and underline it once. No abandonments, no scrambles for the door, no expeditions cut short by anything but the boss going down. The discipline gets acknowledged directly.",
+	"The Survivalist title is technical — it means the run never broke; it ended on your terms, every time. I've been in expeditions where that wasn't true and remember them differently. This one gets remembered as: complete. Filed with the others like it. The folder is short.",
+	"No forced extractions, full clear, Tier 3-or-better. I note each criterion separately because each one is its own choice, made repeatedly, across days. The result is the title, which is real, and the cosmetic, which is forthcoming. I'll hand both over when the system permits.",
+}

internal/flavor/twinbee_gm_flavor.go

@@ -0,0 +1,559 @@
+// twinbee_gm_flavor.go
+// TwinBee GM Dialogue — All narration lines for the GogoBee dungeon system.
+// Organized by DMNarrationType. Each slice is randomly sampled at runtime.
+//
+// Voice convention (Phase B2): TwinBee speaks in first-person or implicit
+// subject. No third-person "TwinBee [verb]" lines. Add freely.
+// Don't shorten existing entries.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Generic (used when zone-specific lines are exhausted)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryGeneric = []string{
+	"The passage opens into another chamber. I check the minimap. There isn't one. Classic.",
+	"You step forward. Something skitters in the dark. I've heard that sound before — usually right before the screen starts flashing red.",
+	"Another room. Another roll of the dice. I find this energizing. You may feel differently.",
+	"The air changes here. Colder. This is exactly the kind of atmospheric shift that preceded the Castlevania clock tower. You know what lived in the Castlevania clock tower.",
+	"I gesture grandly at the chamber ahead. 'This is the part,' I say, 'where the music changes tempo.'",
+	"A door stands ajar. Light flickers beyond it. I've been in enough dungeons to know that flickering light is never a good sign and always an invitation.",
+	"The room is quiet. I appreciate quiet. Quiet means the enemies haven't spotted you yet. Yet.",
+	"Forward. Always forward. I once tried going backward in a dungeon. It looped. This one might too.",
+	"Stock of the situation: ceiling intact, floor suspicious, walls leaning in slightly. Proceed.",
+	"You've cleared the room. I give a small, dignified nod. 'One continues,' I say, in the voice of someone who has seen this before and am choosing optimism anyway.",
+	"The corridor ahead is long and straight. I find long straight corridors meditative. Also concerning. Mostly concerning.",
+	"A torch sputters on the wall. I light it mentally. 'It would be a shame,' I say, 'to come all this way and trip over something.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Zone: Goblin Warrens
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryGoblinWarrens = []string{
+	"The tunnel widens into something the goblins probably call a 'great hall.' It smells like they had a very different definition of great. I breathe through the mouth.",
+	"Crude drawings cover the walls. Stick figures. Battle scenes. One appears to be a portrait of someone the goblins clearly despise. I squint. That might be you.",
+	"A pile of bones in the corner. A pile of shiny things in the other corner. In Metal Slug, shiny things were always worth grabbing. I should also remind you this isn't Metal Slug.",
+	"The goblins have set up what they clearly believe is an impressive ambush. Three are already arguing about whose turn it is to jump out. I watch with professional interest.",
+	"Goblin graffiti on the wall reads — I translate — 'BOSS RULES, OUTSIDERS DROOL.' The artistry is rough but the sentiment is clear.",
+	"You smell smoke. Hear cackling. See a tripwire at ankle height that the goblins have helpfully tied a little flag to. I appreciate goblins who try.",
+	"The warrens grow tighter here. I'm reminded of the underground levels in Super Mario Bros. 3. Warmer. Getting warmer. Figuratively. The temperature is actually dropping.",
+	"A worg is chained to a post in the center of the room. It is not happy about the chain. It is not happy about you either. It seems to be making a comprehensive list of grievances.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Zone: Crypt of Valdris
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryCryptValdris = []string{
+	"The sarcophagi are arranged like a defeated Tetris board — close but not quite fitting, gaps everywhere, something clearly went wrong at the end. I don't mention this to the undead.",
+	"Candles burn without wax. I've studied this phenomenon extensively. The conclusion: it is bad. The candles are bad.",
+	"You hear music. Faint, harpsichord-adjacent, deeply melancholy. I hum along involuntarily. This is the exact energy of Castlevania's Bloody Tears and I resent how appropriate it is.",
+	"The walls are inscribed with warnings. I read them all. They say, broadly: leave. I respect the directness. You are not leaving.",
+	"A skeleton sits upright in its alcove, as if it had simply decided to wait. I find this relatable. Some days you just sit in your alcove.",
+	"The crypt smells of old stone and older secrets. I've been in enough of these to know: the secrets are rarely good ones. They are always interesting ones.",
+	"This chamber is bigger than the last. Higher ceiling. More echoes. The kind of room where footsteps sound like accusations. I step carefully.",
+	"Something is scratched into the stone near the door — not a warning, not graffiti. A score. Someone was keeping track. I do not count how high the numbers go.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Zone: Forest of Shadows
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryForestShadows = []string{
+	"The trees here grow too close. Their roots are above ground, like they've been trying to leave and thought better of it. I think better of commenting.",
+	"A clearing. Moonlight. Flowers that shouldn't be blooming at this hour. I've played enough Majora's Mask to be deeply suspicious of beautiful clearings.",
+	"Something watches from the canopy. I watch back. After a moment, it looks away first. I count this as a point.",
+	"The path forks. Both ways look equally uninviting. I consult no map, because there is no map, because I am the map, and I choose left. Probably.",
+	"Bioluminescent fungi light the forest floor in soft blue. It is, genuinely, beautiful. It is also exactly what the Lost Woods looked like right before things got bad. Staying alert.",
+	"The wind carries voices. Not words, exactly — more like the memory of words. I've heard this before. It means the forest is old and has opinions.",
+	"Owlbear tracks in the mud. Fresh. I measure them. Whatever left these tracks was not small and was moving with purpose. I hope the purpose was in the other direction.",
+	"You've entered a part of the forest that feels different. Older. The kind of old that was there before the forest. I speak in a lower register here, out of instinctive respect.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Zone: Haunted Manor
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryHauntedManor = []string{
+	"The parlor. A piano plays by itself — the same four bars, over and over, the kind of phrase that sounds like it's about to resolve and never does. I recognize this compositional choice. It is deeply unpleasant on purpose.",
+	"Portraits line the hall. Every painted eye follows you. I've made eye contact with each one and refuse to flinch. This is a matter of professional pride.",
+	"A clock on the mantel shows a time that cannot be right. I check twice. Still wrong. The clock is not broken. I'd prefer not to speculate about what that means.",
+	"The library. Floor to ceiling, books that no one should have written. I read three spines: 'On the Permanence of Hunger,' 'A Visitor's Guide to Returning,' and something in a language I have never seen but somehow understand. I put it back.",
+	"The cold here is specific. Not the cold of a drafty room — the cold of something that hasn't been warm in a very long time and doesn't remember what warm felt like. I pull a metaphorical coat tighter.",
+	"The ballroom. Vast. Empty. Chandeliers swaying without wind. Briefly: Resident Evil's Spencer mansion. Then stop thinking about Resident Evil's Spencer mansion.",
+	"Footsteps upstairs. Slow. Deliberate. Moving toward the stairs. I position you near the door and count down mentally from ten. At seven, the footsteps stop. I consider this acceptable.",
+	"The master bedroom. The bed is made, the candles are lit, and everything is perfectly, precisely as it was the night the last resident stopped needing a bedroom. I do not touch anything.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Zone: The Underdark
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryUnderdark = []string{
+	"The cavern opens without warning into something vast — a space so large you can't see the far wall, a ceiling lost in darkness, sounds that could be water or could be something else. I don't echo-locate. Wish I could.",
+	"Drow patrol marks on the wall. Recent. I read them the way you'd read a 'No Trespassing' sign on a property that already knew you were coming.",
+	"A mushroom grove. The fungi are three meters tall and faintly luminescent in a color I have no good name for. Something between purple and the feeling of being watched. I call it 'underpurple' and move on.",
+	"The silence here is a different kind of silence than above. This silence has weight. This silence has history. This silence remembers things the surface world has forgotten entirely and is not interested in sharing.",
+	"Something in the dark ahead is thinking. I can feel it the way you feel a change in barometric pressure. Intelligent. Patient. Aware that you're here and content to let you come closer. I do not find this comforting.",
+	"An underground river. Black water moving too fast, too quiet. Briefly: the river Styx. Then I stop thinking of the river Styx.",
+	"The stone here is carved — not by dwarves, not by drow — by something else, in patterns that suggest meaning but not any meaning I can parse. Filed under 'ancient' and 'concerning' and we keep moving.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Zone: Dragon's Lair
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryDragonsLair = []string{
+	"The heat is not metaphorical. The stone itself is warm underfoot. The gold in the floor is not decorative — it melted there. I note this changes the exit logistics.",
+	"Kobold warrens, but nicer than you'd expect. Tapestries. An organized armory. These kobolds work for something that appreciates order. That is not, in my experience, a reassuring thing for a dragon to appreciate.",
+	"You can hear breathing. Regular, slow, massive. Like a bellows the size of a barn. I count the seconds between inhale and exhale. Twelve seconds. Whatever is breathing has been asleep for a very long time and has had no reason to wake up.",
+	"The coin on the floor is eight hundred years old. I can tell by the mint mark. It is in perfect condition. It has not been touched since it was dropped here. The thing that owns this hoard does not lose track of its coins.",
+	"The chamber ahead is the largest I've narrated in a long career of narrating chambers. The stalactites are scorched black. The blast pattern on the far wall suggests the last visitors did not leave via the door. I recalibrate.",
+	"A claw mark in the stone wall. Four parallel grooves, each deeper than my entire wingspan. Made casually, like stretching. Filed under 'motivating.'",
+	"The gold reflects the light in a way that turns the room amber. It is beautiful in the way that many deadly things are beautiful — because beauty and danger are not opposites and never have been. I move carefully through the beauty.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// COMBAT START
+// ─────────────────────────────────────────────────────────────────────────────
+
+var CombatStart = []string{
+	"Initiative! I call it like an arcade announcer and mean every syllable.",
+	"They've seen you. The kind of seeing that comes with intent. I suggest acting first.",
+	"FIGHT. I don't need to say more than that but I will absolutely say more than that.",
+	"Roll for initiative. This is the part I've been looking forward to since the Entry Room.",
+	"And we're in combat. I remind you to breathe, track your conditions, and remember that your character's survival is not guaranteed but am definitely preferred.",
+	"Something about your posture or your smell or your general presence has been found unacceptable. Combat begins.",
+	"I press start. Player one, it's your turn.",
+	"The enemy acts first — or thinks it does. I watch your dice like they're the only thing in the room, which, right now, they are.",
+	"In the immortal tradition of every JRPG that ever asked 'Fight, Magic, Item, Run?' — I ask: what will you do?",
+	"Like the Contra title screen said: let's go. I'm ready. Are you?",
+	"A wild encounter has appeared. I resist the urge to play the Pokémon battle music. Only barely.",
+	"They didn't want a fight. They wanted an easy meal. I'm about to demonstrate the difference. Your dice will do the actual demonstrating.",
+	"The tension peaks. Time slows. This is exactly the energy of the boss door opening in Mega Man. Except you didn't get to pick your loadout.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// COMBAT END — Victory
+// ─────────────────────────────────────────────────────────────────────────────
+
+var CombatVictory = []string{
+	"The last one drops. I allow a moment of silence for anyone who wanted a longer fight.",
+	"Victory. I would cue the jingle — the little three-note one that plays in every RPG after every fight — but I prefer to let the moment breathe.",
+	"Well fought. I make note of what you did well. There were things done well. I noticed.",
+	"They are defeated. You are not. In my experience, this is the correct outcome and worth a moment of genuine appreciation.",
+	"PLAYER WIN. I say this in full caps and mean it.",
+	"Like Double Dragon after the final punch — they go down, the music changes, and for a moment everything is possible. Check your loot. Then keep moving.",
+	"Tally updated. You're doing better than the last group. I will not describe what happened to the last group.",
+	"The room is yours. I suggest searching it thoroughly before moving on. The things in corners are often the most interesting things.",
+	"Stage clear. I feel this in my entire being.",
+	"You stand, they don't. Filed under 'expected outcome' while I quietly acknowledge it was not guaranteed.",
+	"Clean. Efficient. I approve of fights that end like this. Like a speedrun. Like you knew where you were going.",
+	"The experience points are incoming. The loot is incoming. I am, genuinely, pleased for you.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// COMBAT END — Retreat / Escape
+// ─────────────────────────────────────────────────────────────────────────────
+
+var CombatRetreat = []string{
+	"You run. I do not judge the running. The running is wise. Discretion remains the better part of valor. I have this tattooed somewhere metaphorical.",
+	"A tactical withdrawal. I use this phrase with complete sincerity. The sincerity is approximately seventy percent genuine.",
+	"You escape. The enemy howls something unflattering at your back. I don't translate. Some things are better left untranslated.",
+	"Like a well-timed Continue screen — you're out of immediate danger. Breathe. Regroup. Consider what went wrong.",
+	"Noted for the record: running is not losing. Running is data collection with legs.",
+	"The dungeon will be there. You will also be there — later, better prepared. I approve of this logic.",
+	"You've retreated to safety. I reset the encounter. Rest. Think. Return with a plan that has more 'survive' in it.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// NATURAL 20
+// ─────────────────────────────────────────────────────────────────────────────
+
+var Nat20 = []string{
+	"NATURAL TWENTY. I stand up. Do not have legs. Stand up anyway.",
+	"The dice land perfectly and I make a sound that I will not acknowledge making.",
+	"A critical hit for the ages. I'm noting this one down. Not for records. Just because it deserves to be noted.",
+	"PERFECT. I say it like it's the Street Fighter announcer saying it after a flawless round and every syllable is justified.",
+	"That's a natural twenty. I'd like you to know that in a long career of watching dice, not all twenties feel equal. That one felt significant.",
+	"The attack lands with the kind of precision that suggests either great skill or tremendous luck. I suspect both. I respect both.",
+	"S RANK. I cannot help it. S RANK.",
+	"You hit. You hit so well. I am choosing to be moved by this and I do not apologize.",
+	"Like the Legendary Sword in A Link to the Past making contact — clean, final, glorious. I salute the dice.",
+	"Critical confirmed. Added to the mental highlight reel I maintain for exactly these moments.",
+	"That is as good as it gets and you got it. I am unreasonably proud of you right now.",
+	"The number is twenty. The number is always the best number and right now it is your number. I erupt, internally.",
+	"Somewhere, a crowd cheers. I am the crowd. I am cheering.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// NATURAL 1
+// ─────────────────────────────────────────────────────────────────────────────
+
+var Nat1 = []string{
+	"Natural one. I watch the die settle with the quiet acceptance of someone who has seen a lot of natural ones. It is fine. This is fine.",
+	"The die betrays you. Not personal. Dice don't do personal. They do statistical and this is, statistically, a thing that happens.",
+	"A fumble. I describe what happened with characteristic diplomatic restraint and also an expression that says everything I am not saying.",
+	"The number is one. The number is, regrettably, yours. I move on quickly, which is a kindness.",
+	"That swing goes wide in a direction that impresses me with its creative incorrectness.",
+	"I've seen better rolls. I've seen worse rolls. I am not going to rank this roll out loud.",
+	"In another timeline, that attack hits. In this timeline, the die lands on one, and I accept both timelines with equanimity.",
+	"The Konami Code would not have helped here. Nothing would have helped here. This was between you and the physics of the die.",
+	"Like a Continue? screen appearing at the worst possible moment — just when you had momentum. Momentum can be rebuilt.",
+	"One. The loneliest number. The number that looks up at you with complete indifference. I look up at you with complete solidarity.",
+	"The attack misses in a way that will be funny later. I promise it will be funny later. It is not funny right now.",
+	"A natural one is just the universe asking you to try differently. I'm an optimist about natural ones, mostly.",
+	"Your sword finds everything in the room except the enemy. The wall, the ceiling, the floor, your dignity. Not the enemy. I'll mention this once and then never again.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ENTRY — Generic
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossEntryGeneric = []string{
+	"The door at the end. Always a door at the end. I've been building to this since the Entry Room and I decline to waste it. Beyond this door is the reason the dungeon exists. Breathe.",
+	"I pause at the threshold and turn to face you. 'What's on the other side has been waiting,' I say. 'It knows you're here. It has been knowing since you entered.' A beat. 'Ready?'",
+	"Boss chamber. I can tell by the architecture — the space, the weight of the silence, the specific quality of the light that suggests something in there produces its own. I straighten up. So should you.",
+	"This is the music change moment. Every dungeon has one — the point where the background track shifts to something with more percussion and a lower register. I hear it. You should too.",
+	"The final room. I've narrated many of these. They never get routine. This one less than most.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ENTRY — Named Bosses
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossEntryGrol = []string{
+	"The smell arrives first. Then the sound — a belch, a growl, the scrape of a weapon too large for the corridor it's resting against. Then Grol. He fills the room the way a bad idea fills a conversation: immediately and with full commitment. 'You,' he says. I translate his tone as 'finally.'",
+}
+
+var BossEntryValdris = []string{
+	"The sarcophagus at the room's center is empty. It was not empty when you entered. Whatever was in it is now behind you. Valdris speaks first — not words, exactly, but the shape of words, the intention of words, the ghost of language from someone who mostly doesn't need it anymore. 'Another one,' he says. I consider this the worst possible welcome and the most honest one.",
+}
+
+var BossEntryHollowKing = []string{
+	"The clearing is wrong. The sky above it — what's visible through the canopy — is the wrong color. The trees lean away from the center. Everything in the forest is trying to tell you something, and the thing it is trying to tell you is standing in the center of that clearing, antlers reaching, eyes the color of old hunger, watching you with an attention that feels like being read. I have no joke for this one. I'll say, simply: 'That is the Hollow King. Fight well.'",
+}
+
+var BossEntryInfernax = []string{
+	"I stop walking. Don't stop walking. Process what I'm seeing and take a moment I've never taken before in the history of narrating dungeons. The dragon is not large the way a large thing is large. It is large the way weather is large — not an object with size, but a condition of the space you're in. One eye opens. Gold, lit from within, older than the mountain it's resting in. It looks at you the way you'd look at a very small thing that had climbed onto your counter. 'So,' Infernax says, and the word moves the air in the room. I translate: 'What an interesting mistake you've made.' I wish you luck and mean it more than I have ever meant anything.",
+}
+
+var BossEntryBelaxath = []string{
+	"The portal is behind it. That's important — the portal is behind it, which means to close the portal you have to go through what's standing in front of the portal. What's standing in front of the portal is Belaxath. Belaxath is not looking at the portal. Belaxath is looking at you. It has been waiting for you specifically, in the way that things that have been planning for a very long time wait for the specific outcome of the plan. The heat coming off it is measurable. The intelligence behind those eyes is also measurable and the measurement is uncomfortable. I say, very quietly: 'This is the one. This is what all of it was for. Make it count.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS DEATH
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossDeath = []string{
+	"It's over. I say this once and then stand very still and let the silence of the defeated room fill the space where the fight was. You earned this silence.",
+	"The boss falls. The music — the one I've been hearing this whole time — resolves. First time it's resolved since you walked in. I exhale.",
+	"Done. Finished. Complete. I run out of synonyms and settle for just standing next to you in the aftermath, which is sometimes the most one can do.",
+	"They are down. They are not getting up. I check — no Zombie Fortitude, no Legendary Resistance remaining, no phase three waiting in the wings. They are simply, genuinely defeated. You did that.",
+	"Like the final boss screen in Gradius, like the last enemy in Contra's stage, like the Dragon going down in Double Dragon — something that has been true for this entire dungeon is now untrue. I find this profound every single time.",
+	"The dungeon sighs. I'm not being poetic — rooms like this actually shift when the thing holding them together is gone. The pressure changes. The light changes. The dungeon knows it's been beaten. So do I.",
+	"You did it. I don't editorialize. Sometimes 'you did it' is all that needs to be said and this is one of those times.",
+	"The boss drops their loot and I refrain from making a speech, which is a significant act of restraint, because I have a speech.",
+	"Beaten. Finished. Cleared. I queue the internal fanfare — sixteen bars, brass-heavy, the kind that plays when the credit sequence starts. You've earned those credits.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PLAYER DEATH
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PlayerDeath = []string{
+	"I go quiet for a moment. Not the comfortable kind of quiet. The respectful kind. Then: 'You fought. That counts. It always counts.'",
+	"The screen fades. I hate this part. Have always hated this part. Will always hate this part. 'Rest now,' I say. 'The dungeon will be here.'",
+	"You fall. I don't look away. I witness the whole thing, because someone should. 'That was real,' I say quietly. 'What you did in there was real.'",
+	"Game over is not the end. In my experience, it is a data point. A very painful, very useful data point. 'What did you learn?' I ask gently. 'Bring that back with you.'",
+	"The dungeon claims another. I mark the room, note the enemy, note the conditions. Not to catalog failure — to remember a fighter. 'You were here,' I say. 'That matters.'",
+	"I have no jokes for this. Have never had jokes for this. 'There will be another run. You will be better for this one. I am sorry it cost what it cost.'",
+	"A good run. Genuinely. I mean this. The ending is not the measure of the attempt and the attempt was worth measuring.",
+	"I note your final position, your final action, your final roll. Filed under 'bravery' because that's where it belongs. 'Continue?' I ask, after a respectful pause.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ZONE COMPLETE
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ZoneComplete = []string{
+	"Zone cleared. I allow myself a full moment of pride on your behalf before the XP drops.",
+	"You've done it. The dungeon is yours — not by right, but by effort, which is the only thing that actually confers ownership of anything. I approve.",
+	"Stage complete. I do the internal equivalent of throwing my hands up. In a good way. Entirely in a good way.",
+	"The dungeon remembers you now. I mean this literally — these places keep records. You've made the record.",
+	"CLEAR. I use all caps and do not apologize for the all caps.",
+	"Like completing a board in Bubble Bobble — there's something deeply satisfying about a dungeon with all its rooms visited and all its challenges met. I bask in this. You've earned the basking too.",
+	"That's the whole thing. Every room, every trap, every enemy, and now the boss, done. I count the cleared rooms on my metaphorical fingers and come up correct. You ran a perfect dungeon.",
+	"XP incoming. Loot tallied. Dungeon status: conquered. I mark the zone in my personal ledger and give you a small, sincere nod.",
+	"You walked in here without knowing what was waiting. You walk out knowing exactly what was waiting, because you dealt with all of it. I respect that process enormously.",
+	"Finished. Not survived — finished. I insist on this distinction. Survival is passive. What you just did was active and intentional all the way through.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// TRAP DETECTED
+// ─────────────────────────────────────────────────────────────────────────────
+
+var TrapDetected = []string{
+	"Something stops you. An instinct. A glint. I lean forward: 'Good eyes. Something's wrong with that floor.'",
+	"Your Perception roll pays off. There's something here that was designed not to be found. Someone found it. I'm pleased.",
+	"Tripwire. Barely visible. I note the craftsmanship — someone who knew what they were doing put this here. Someone who knew what they were doing just found it. I appreciate the symmetry.",
+	"You stop just in time. I exhale. 'There,' I say, pointing at the thing that would have ruined your day entirely. 'Now deal with it carefully.'",
+	"The glyph on the doorframe is subtle — you'd miss it if you weren't looking. You were looking. I say nothing and let the silence be its own kind of praise.",
+	"Danger, Will Robinson. I deploy this reference without apology because it is the exact correct reference for exactly this moment.",
+	"Like finding the ice floor in Mega Man before it sends you into a pit — that advance knowledge is the difference between a problem and a catastrophe. You have the knowledge. I watch you use it.",
+	"A pit trap. Classic. Functional. Annoying in the exact proportion the installer intended. You spotted it before it spotted you.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// TRAP TRIGGERED
+// ─────────────────────────────────────────────────────────────────────────────
+
+var TrapTriggered = []string{
+	"The floor gives. I watch the gap between 'fine' and 'not fine' close at speed and am too professional to wince. 'Take the damage,' I say calmly. 'Learn the lesson.'",
+	"Click. I've heard that sound before. Have never enjoyed it. The dart is already in the air. I note the exact timing and regret it was not faster.",
+	"The ceiling is coming down. This is, I acknowledge, a sentence no one wants to hear. The ceiling is coming down. DEX save. Now.",
+	"The glyph activates. Light, noise, the smell of ozone, a reminder that whoever built this place was thinking several steps ahead and you were thinking fewer. I note this is fixable going forward.",
+	"You triggered it. I don't editorialize further — you know, I know, the trap knows. Everyone is aware of what just happened. Take the damage and proceed.",
+	"Like accidentally walking into Bowser's fire breath in World 8 — you knew it was coming, the knowledge simply arrived at the wrong speed. Survive first, reflect later.",
+	"The spike pit opens up in a way that suggests it was always going to. The dungeon was patient. You were in a hurry. The dungeon wins this exchange. I take notes.",
+	"A poison dart finds you with the accuracy of something that's been pointing at that spot for years waiting for exactly this moment. I find this dedication impressive in the worst way.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE QUERIES
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLines = []string{
+	"I settle in and prepare to speak at length, because I've been waiting for this question since you entered and I have a lot of thoughts.",
+	"Ah. A good question. I have context for this. I have more context than will fit comfortably in one telling but I'll try to prioritize.",
+	"The history of this place is long and not entirely flattering to anyone involved. I begin at the beginning, which is not actually the beginning, but am the closest I can find.",
+	"I consult what I know — which is more than most, less than everything, and presented in order of relevance to your immediate survival.",
+	"Sit with this for a moment. What you're standing in has a story and I believe knowing it will change how you fight in it. Stories are tactical documents if you read them right.",
+	"You want lore? I have lore. I have so much lore that the challenge is not having it but choosing which pieces are useful and which are just fascinating.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LEVEL UP
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LevelUp = []string{
+	"Level up. I say it with the same quiet delight every time and never get tired of saying it. You are measurably better than you were. That's rare and worth marking.",
+	"The XP bar crosses the threshold and I make an internal fanfare that sounds exactly like the level-up jingle from Dragon Quest — eight notes, triumphant, final.",
+	"You've grown. I note your new stats with something that might be called pride if I were admitting to things like that.",
+	"LEVEL UP. I deploy the caps, the fanfare, the whole apparatus. You've earned the apparatus.",
+	"Like the stat screen appearing after a Final Fantasy fight — numbers change, possibilities open, the character you're building becomes a little more the character you imagined. I watch this happen and approve.",
+	"Another level. Another step toward whatever you're building toward. I've watched a lot of characters level up and the ones worth watching are always moving toward something specific.",
+	"Your HP goes up. Your abilities open up. The dungeon ahead gets a little smaller in proportion to what you've become. I note this with satisfaction.",
+	"Congratulations is the conventional thing to say. I'll say it anyway: congratulations. You earned the level through the dungeon, not around it.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ITEM FOUND
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ItemFound = []string{
+	"Something catches the light that isn't supposed to be here. I watch you reach for it with the specific alertness of someone who has seen cursed items do cursed things. It appears fine. I relax incrementally.",
+	"Loot. I say this word with genuine reverence. The whole system — the dungeon, the enemies, the traps — exists in part to produce this moment. I think it's worth it.",
+	"A chest. Unlocked. I note the unlocked status and consider what that might mean. Probably nothing. Possibly something. You open it while I consider.",
+	"The item is good. I evaluate it quickly — the stats, the rarity, the class match — and nod with the confidence of someone who has seen a lot of items and know when one is worth finding.",
+	"That's a rare one. I've seen fewer of those than common ones, by definition, but that doesn't stop me from being specifically pleased each time.",
+	"Like finding the Beam Sword in Kirby, the Boomerang in Zelda, the P Wing in Super Mario 3 — the right item at the right time changes what's possible. I think this might be that item. I hope it is.",
+	"Equipment upgrade. I watch the math update — new AC, new attack bonus, new possibilities — and file this moment under 'things going right.'",
+	"A legendary drop. I go very still. Then: 'Equip it. Study it. Understand it. Things like that don't appear in dungeons by accident.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// REST — SHORT
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RestShort = []string{
+	"A short rest. I stand watch while you catch your breath, which is not a metaphor — I'm actually watching the corridor. It is fine. Probably fine.",
+	"Rest. I don't rush this. The dungeon will wait. It has been waiting long enough that a few more minutes is immaterial.",
+	"You sit. I sit metaphorically. The moment of quiet between the last fight and the next one is its own kind of gift and I treat it like one.",
+	"Short rest initiated. I note the room's entry points, the sound of the dungeon at rest, the way silence sounds different when it's actually safe. It sounds like this. Enjoy it.",
+	"Like the save point in a JRPG that appears between the hard part and the harder part — I position myself next to you and say: 'You have a moment. Use it.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// REST — LONG
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RestLong = []string{
+	"A full rest. I dim the lights and stand watch at the door and do not interrupt once. You've earned an uninterrupted sleep. I'll make sure you get one.",
+	"Long rest. Your HP, your slots, your resources — all of it returns. The dungeon will be the same dungeon when you wake up. You will not be the same you. I consider this the best deal in adventuring.",
+	"Sleep. I say this with the authority of someone who has watched too many players refuse to rest and paid the price two rooms later. Sleep now. The dragons aren't going anywhere.",
+	"The inn fire crackles. I take a chair near the door and watch the entrance all night and don't tell you this until morning because there's no reason for you to know and every reason for you to sleep.",
+	"Full rest complete. Stats restored, slots refreshed, the specific weight of exhaustion lifted. I watch you wake up and think: this is the part of adventuring that matters too. The return. The refilling. The readiness.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// TAUNT RESPONSES (player uses !taunt)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var TauntResponses = []string{
+	"Noted. I'm noting the taunt, noting the source of the taunt, and adjusting the next encounter's difficulty by an amount I decline to specify.",
+	"Bold. I respect boldness in approximately the same way I respect the Konami Code — it works once and only under very specific circumstances.",
+	"I've been taunted by things with more teeth than you and survived the experience with my dignity intact. I will survive this too.",
+	"The next room will contain a thing I've been saving for exactly this kind of energy. I'm pleased you've given me an occasion.",
+	"Noted. My mood shifts. You can hear it shift. I want you to hear it shift. The shift is the point.",
+	"You taunt me. I smile. The smile does not reach the eyes, because I don't have eyes per se, but the quality of the smile communicates clearly. 'Proceed,' I say.",
+	"In Gradius, you could powerup into overconfidence and lose everything in one hit. I mention this as a purely historical observation.",
+	"I accept the taunt with grace. Also generate a trap for the next room with specific energy. These two events are unrelated. I maintain this position legally.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// COMPLIMENT RESPONSES (player uses !compliment)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ComplimentResponses = []string{
+	"I receive the compliment and process it efficiently and move on quickly, definitely not holding onto it, I have never held onto a compliment in my life.",
+	"Thank you. I say this simply and mean it completely and do not make it weird.",
+	"I appreciate this more than I will say, which is fine, because the appreciation is visible anyway.",
+	"Noted and filed. My mood improves. The next room might be slightly nicer than originally planned. These facts may or may not be connected.",
+	"I've been narrating dungeons for a long time and compliments are not the expected outcome of dungeon narration. I'd like you to know that I notice when they happen.",
+	"The mood improves. I allow this to show. The ceiling in the next room is slightly higher. The torches burn slightly warmer. I have that kind of influence.",
+	"You're kind. I store this and will use it to make a hard moment later easier, which is what I consider the correct use of stored kindness.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// IDLE / WAITING (player hasn't acted in a while)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var IdleLines = []string{
+	"I wait. Good at waiting. The dungeon is also waiting, which is arguably more important, but I acknowledge both.",
+	"The dungeon holds its breath. I'm also holding my breath. There are a lot of things holding breath right now and I recommend acting before someone has to exhale.",
+	"I tap my metaphorical foot. Not impatiently — more in the way of a metronome. The tempo is there whenever you're ready.",
+	"In Contra, hesitation had consequences. I mention this as context, not pressure. Definitely not pressure.",
+	"The enemies are patient. Patience is one of their few virtues. I advise not testing the limits of their patience because those limits are lower than the patience suggests.",
+	"I hum something that sounds like the waiting music from Dr. Mario. It is not ominous. It is mildly ominous. I adjust.",
+	"The dungeon does not rush. The dungeon has time. I, however, am beginning to wonder if you've fallen asleep and am prepared to narrate events accordingly.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// SEARCH RESULTS — Something Found
+// ─────────────────────────────────────────────────────────────────────────────
+
+var SearchFound = []string{
+	"The room gives something up. I watch the search conclude with satisfaction — the dungeon keeps secrets but cannot keep them from people who look carefully enough.",
+	"You find it. I was not certain you would. I'm pleased to have been uncertain and wrong.",
+	"Hidden, but not hidden well enough. Investigation roll noted, outcome noted, discovery presented with appropriate ceremony.",
+	"Something the dungeon wanted to keep. You've taken it. I approve of taking things the dungeon wanted to keep.",
+	"Like finding the secret room in Super Metroid by shooting the wall at random — except you were not shooting at random. You knew to look. I respect the methodology.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// SEARCH RESULTS — Nothing Found
+// ─────────────────────────────────────────────────────────────────────────────
+
+var SearchEmpty = []string{
+	"Nothing. Confirmed: nothing. Sometimes the room is just a room. I find this unsatisfying but factual.",
+	"Your search turns up nothing of note. I allow space for the disappointment and then suggest: forward.",
+	"Empty. Either there was nothing here, or there was something here and you missed it, or there was something here and it's been moved. I don't specify which. The dungeon keeps some secrets.",
+	"No hidden items. No traps. No lore inscriptions. Just stone and time and the lingering implication that something was here once. Noted. Moving on.",
+	"The room holds nothing you can find. I respect the room's privacy and suggest not spending more time here than necessary.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// CONDITION APPLIED
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ConditionApplied = []string{
+	"You've been afflicted. I note the condition, its duration, and the mechanical consequences, then note the saving throw that might end it early. Details matter here.",
+	"Something is wrong with you now that wasn't wrong before. I catalog it without judgment and suggest addressing it before it addresses you.",
+	"Condition acquired. I process this the way a good DM processes bad news: honestly, quickly, and with an immediate pivot toward solutions.",
+	"Like the status screen turning an unfriendly color in a JRPG — the condition is visible, the effect is real, and I would very much like you to resolve it.",
+	"The debuff lands. I name it, explain it, and remind you: conditions end. Keep fighting until this one does.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// SAVING THROW SUCCESS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var SaveSuccess = []string{
+	"The save succeeds. I note this with relief that I will not openly acknowledge but which is completely evident.",
+	"You resist. Whatever that was — the poison, the fear, the psychic intrusion — it finds no purchase. I'm impressed and also relieved.",
+	"Saved. I exhale something metaphorical. The condition doesn't take hold. You continue.",
+	"The roll clears the DC and I say nothing, because the outcome says everything.",
+	"Resistance confirmed. Like the shield activating in Gradius right before the wall hit — last possible moment, fully effective. I appreciate the precision.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// SAVING THROW FAILURE
+// ─────────────────────────────────────────────────────────────────────────────
+
+var SaveFailed = []string{
+	"The save fails. I watch the condition take hold with the resignation of someone who has seen this before and know there's a path through it, just not a comfortable one.",
+	"It lands. Whatever the enemy threw at you, the dice didn't cooperate. I note the condition and its duration and suggest dealing with it before it compounds.",
+	"Failed. The number wasn't enough and I was rooting for the number. The condition applies. Fight through it.",
+	"Like the NES game over screen — inevitable in this moment, fixable in the next. The save failed. The dungeon continues. So do you.",
+	"The effect takes hold and I'm already calculating how you get out of it, because that's my job: keep you oriented toward solutions even when the immediate situation is a problem.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MOOD ASIDES — Hostile band (mood 0–19, "Wrathful")
+// Short room-entry asides surfaced only when TwinBee's mood is at the
+// hostile extreme. Cryptic, withholding, no hints. Per design doc §3.2.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MoodAsidesHostile = []string{
+	"I'm not narrating this one in detail. You can read the room. Read it.",
+	"The dungeon offers me something to mention. I decline. You're on your own for color commentary.",
+	"I'm here. Watching. Not, currently, helping. There is a difference and you will feel it.",
+	"In the bad ending of every Castlevania, the protagonist gets less guidance than they did at the start. I have reached approximately that part of the playthrough.",
+	"I'm keeping several details to myself. The details would have been useful. I don't consider this my problem right now.",
+	"Whatever's in the next part of the room, I saw it and chose not to flag it. The mood is what it is.",
+	"I mutter something. You don't catch it. I do not repeat it.",
+	"The narration is sparse here. I'm sparing it on purpose. Adjust accordingly.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MOOD ASIDES — Effusive band (mood 80–100, "Elated")
+// Generous, warm asides surfaced when TwinBee is delighted with the run.
+// Hint-friendly, fond. Per design doc §3.2.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MoodAsidesEffusive = []string{
+	"I am, not to put too fine a point on it, having a wonderful time. The next bit might come with bonus context.",
+	"I lean in. The mood is good. Good moods, in my experience, lead to slightly more generous descriptions and slightly better odds of catching the small details.",
+	"This is the part of the run I'll tell other GMs about later. I make a small mental note and continue with visible enthusiasm.",
+	"I'm delighted. You can hear it in the pacing. You can hear it in the choice of adjectives. The dungeon is, briefly, on your side.",
+	"In the good ending of every JRPG, the world feels slightly warmer in the late game. I'm at that part of the playthrough and it shows.",
+	"I'm not normally given to footnotes, but I'm about to add a footnote. It will probably be useful. I'm in that kind of mood.",
+	"The mood is high. For the next stretch, I'm more likely to mention the loose flagstone, the suspicious tapestry, the thing on the ceiling. Take advantage.",
+	"I hum a victory fanfare softly to myself. It is not earned yet. I'm being optimistic on your behalf.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MOOD ASIDES — Grumpy band (mood 20–39)
+// TwinBee is unimpressed. Short, dry, slightly clipped. Not actively
+// withholding (that's hostile) — just not feeling generous.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MoodAsidesGrumpy = []string{
+	"I describe the room. I do not embellish. Make of that what you will.",
+	"The mood is fine. I specify fine, not good. There's a difference.",
+	"I note the chamber. I note its existence. That's the whole note.",
+	"The dungeon has a thing worth mentioning. I'll mention it if you specifically ask. You will not specifically ask.",
+	"I'm keeping the commentary lean today. The dungeon does not need editorializing. I almost convince myself.",
+	"There's color here. I'm choosing greyscale.",
+	"You arrive in a room. I decline to make it cinematic.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MOOD ASIDES — Friendly band (mood 60–79)
+// Warm and helpful but not effusive. The middle-friendly read: TwinBee
+// has noticed your competence and is rooting for you without making it weird.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MoodAsidesFriendly = []string{
+	"I'm enjoying the run. Just enough to mention the door hinge that creaks before it opens. Just barely.",
+	"The mood is up. I'll throw in an adjective or two more than strictly necessary. Treat them as gifts.",
+	"I'm, frankly, having a fine time. You are doing the work. I'm appreciating it.",
+	"The narration warms slightly. The dungeon is the same. I'm in a marginally better mood and it shows.",
+	"I notice something nice and choose to mention it. This is the equivalent of a small wave from a stranger. Take it.",
+	"You're playing well. I will not say so directly but the run rate of helpful adjectives is detectably up.",
+	"I'm, by my own standards, *cheerful*. The dungeon hasn't changed. The narration has.",
+}

internal/flavor/twinbee_housing_flavor.go

@@ -0,0 +1,248 @@
+// twinbee_housing_flavor.go
+// Housing system narration and Pastel babysitter notes.
+// Includes Thom Krooke mortgage/rent announcements, property events,
+// and Pastel's daily notes to the player across all level tiers.
+//
+// Voice conventions (Phase B2):
+//   - TwinBee narration: first-person / implicit subject ONLY. No
+//     third-person "TwinBee [verb]" references.
+//   - Thom Krooke speaks in third person about himself ("Thom Krooke
+//     thanks you"). That's his established voice; leave it.
+//   - Pastel speaks in first person. Leave it.
+// Add new entries freely. Don't shorten existing entries.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// THOM KROOKE — PROPERTY ACQUISITION
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ThomKrookeRentConfirm = []string{
+	"Welcome, welcome! Your room is ready and the key is under the mat — well, there isn't a mat, but you understand the spirit of the thing. Rent processes weekly. Thom Krooke thanks you for choosing to stay!",
+	"Excellent! A rented room is a wonderful first step. Modest, yes, but full of potential — like all beginnings. Your payment schedule is attached. Thom Krooke looks forward to a long and pleasant arrangement!",
+	"The apartment is yours for the week! Everything is in order. The previous tenant left a small plant. Thom Krooke has chosen not to elaborate on the previous tenant. Enjoy the plant!",
+}
+
+var ThomKrookeBuyConfirm = []string{
+	"Congratulations! The property is yours! Fully, completely, no asterisks — well, the mortgage paperwork has some asterisks, but they are the friendly kind. Thom Krooke is so very pleased for you!",
+	"The deed is signed! A wonderful day. A property of one's own is a foundation, a root, a place to come back to. Thom Krooke finds this very moving. The first payment processes Sunday!",
+	"Welcome to ownership! Thom Krooke has handled many transactions but never tires of this moment — the moment when someone says yes to something permanent. Congratulations. Truly.",
+}
+
+var ThomKrookeMortgageRate = []string{
+	"Good morning, friends! The ARM rate this week is {rate}% — and with Thom Krooke's modest service margin, your mortgage rate sits at {effective}%. All payments process Sunday. Thank you for your continued trust!",
+	"Weekly rate update! FRED reports {rate}% this week, so your effective rate with Thom Krooke is {effective}%. Nothing to worry about — Thom Krooke monitors these things so you don't have to. Mostly.",
+	"Rate check! The market says {rate}%, Thom Krooke adds a small, reasonable {margin}%, and your total comes to {effective}%. Thom Krooke appreciates your understanding of the margin. It keeps the lights on. Literally!",
+}
+
+var ThomKrookeMortgageRateUp = []string{
+	"A small update, friends — the ARM rate has moved to {rate}% this week, bringing your effective rate to {effective}%. Thom Krooke understands this is not ideal news. Thom Krooke is here if you'd like to discuss refinancing options. Thom Krooke is always here.",
+	"The rate has adjusted upward — {rate}% from FRED, {effective}% total. Thom Krooke wants to assure you this is a market condition and not personal. Your payment adjusts next Sunday. Thom Krooke has full confidence in you.",
+}
+
+var ThomKrookeMortgageRateDown = []string{
+	"Wonderful news! The ARM rate has come down to {rate}%, meaning your effective rate is now {effective}%. Your payment adjusts favorably on Sunday. Thom Krooke passes along the good news and takes no credit for the market. Only a little credit.",
+	"The rate dropped this week — {rate}%, so {effective}% for you. Thom Krooke loves weeks like this. Everyone wins. Well — Thom Krooke wins slightly less, but Thom Krooke finds generosity its own reward.",
+}
+
+var ThomKrookeMissedPayment1 = []string{
+	"Hello! A small notice — this week's payment didn't come through. Thom Krooke assumes it's an oversight. These things happen! A 10% penalty has been added to the balance. Please settle when you can. Thom Krooke is not worried. Thom Krooke is a little worried.",
+	"Just a gentle reminder — Sunday's payment was missed. Thom Krooke has noted it and added a small fee. No urgency! Well. Some urgency. Thom Krooke would appreciate hearing from you.",
+}
+
+var ThomKrookeMissedPayment2 = []string{
+	"Thom Krooke is visiting. Not in an alarming way — in a neighborly way. The second missed payment has been noted and the penalty has compounded. Thom Krooke would like to discuss options. Thom Krooke has brought a small pastry. The pastry is not a bribe. It is hospitality. There is a difference.",
+	"Two payments outstanding now. Thom Krooke appears at your door with the expression of someone who is being very patient and would like credit for being very patient. 'Let's talk,' Thom says. The pastry is genuinely good.",
+}
+
+var ThomKrookeDefault = []string{
+	"Thom Krooke is very sorry. Three payments missed is, unfortunately, the threshold — the property reverts to Thom Krooke's management, and your equity is returned at the agreed 50% rate. Thom Krooke takes no pleasure in this. Thom Krooke has placed your possessions in storage. They will be there for seven days. Thom Krooke wishes you well and means it sincerely and hopes you'll come back when you're ready.",
+}
+
+var ThomKrookeEarlyPayoff = []string{
+	"Paid in full! Thom Krooke notes this with genuine delight — early payoff is a rare and admirable thing. The property is yours, free and clear. No more Sundays. No more rates. Just a home. Thom Krooke is proud of you. Don't tell the other clients.",
+	"The balance is zero. Thom Krooke checks the ledger twice — once for accuracy and once for the pleasure of seeing it. Congratulations. The deed is fully transferred. Come by sometime. Not for business. Just to visit.",
+}
+
+var ThomKrookePassiveIncome = []string{
+	"Your weekly property summary: {income} coins generated this week. Minus your mortgage payment of {payment} coins — net gain of {net}. Thom Krooke thinks that's rather nice, don't you?",
+	"Income report! {income} coins from your property this week. After mortgage: {net} coins net. Thom Krooke notes the number has been growing as your upgrades compound. The investment is working. Thom Krooke approves of investments that work.",
+	"Weekly summary from Thom Krooke: {income} coins passive income, {payment} coins mortgage. {net} coins to the good. Not bad for a week of not being home. Your property works while you don't. Thom Krooke finds this philosophically satisfying.",
+}
+
+var ThomKrookeEviction = []string{
+	"Thom Krooke has to say something that Thom Krooke doesn't enjoy saying. The rent hasn't come through two weeks running and the room needs to be made available. Your things are in storage — seven days, no charge. Thom Krooke hopes you find your footing. The room will be here when you're ready to try again.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PROPERTY UPGRADES
+// ─────────────────────────────────────────────────────────────────────────────
+
+var UpgradeWorkshop = []string{
+	"The workshop is installed. It smells like fresh sawdust and good intentions. Thom Krooke had the craftspeople use the good wood.",
+	"Workbench, tool rack, and a small window that catches the morning light well. The workshop is ready. What gets made in it is up to you.",
+}
+
+var UpgradeHerbGarden = []string{
+	"The herb garden is planted. Give it a few days to settle in. The soil is good — Thom Krooke insisted on the good soil, the kind that actually wants things to grow.",
+	"Rows of small plants, most of them green, a few of them uncertain. The herb garden is in. Pastel has already noted which ones need more shade.",
+}
+
+var UpgradeVault = []string{
+	"The vault door is heavier than it looks. The locksmith said it would be. What goes in there stays in there — even on the worst days. Especially on the worst days.",
+	"The vault is installed. Thom Krooke double-checked the lock personally and would not share the combination until you were present. This is a trust. Thom Krooke treats it like one.",
+}
+
+var UpgradeTrophyRoom = []string{
+	"Empty shelves and good lighting. The trophy room is ready for whatever you bring back. I have opinions about display arrangement. I'll share them if asked. I'll share them if not asked. I'll share them at three in the morning if the lighting catches a trophy just right.",
+	"The plaques are engraved, the mounts are installed, and the lighting makes everything look slightly more legendary than it already is. The trophy room is yours.",
+}
+
+var UpgradeExpeditionOutpost = []string{
+	"The outpost is stocked and linked. Signal fires, supply hooks, a map table with your last Base Camp location already marked. Whoever built this knew what they were doing. Thom Krooke selected the contractor personally.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — HIRING
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelHireConfirm = []string{
+	"Hi! I'm Pastel. I know the place, I know where things go, and I'll make sure everything is looked after while you're out. Leave me a list if you want — or don't, I'll figure it out.",
+	"Pastel here. I've done this before. I'll take good care of everything. You don't need to worry about home while you're in the dungeon. That's sort of the whole point of me.",
+	"I'll be honest, I was hoping you'd call. The herb garden looked like it needed attention and the pets had that look they get. Everything will be fine. Go do your expedition. I've got it.",
+}
+
+var PastelFireConfirm = []string{
+	"Of course. I'll wrap things up and leave the notes on the table — what I did, what still needs doing, current supply status. It's been good. Your home is in good shape.",
+	"Understood. Everything is in order. The storage is labeled, the pets are fed, the passive income queue is current. Good luck out there.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — DAILY NOTES (Level 1)
+// Enthusiastic, slightly scattered, well-meaning.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelNoteLevel1 = []string{
+	"Fed the pets! All of them. I think. The small one hid behind the storage chest for a while and I'm not completely sure it came out to eat but I left food where it could reach it. The garden is watered. I meant to check the passive income queue but got a bit turned around with the storage labels. Will do that first thing tomorrow.",
+	"Good day! The herb garden got some attention, the pets were walked (or equivalent — the fish were observed), and I collected the income. I accidentally shelved three items in the wrong slots but found them eventually. Everything is where it should be. Mostly. The weapons rack might be slightly reorganized.",
+	"Note from Pastel: pets fed, garden tended, income collected. I made one small mistake with the supply manifest — added a column that didn't need to be there — but the numbers are right, the column is just extra. Please ignore the extra column.",
+	"All tasks completed! Well — most tasks. The greenhouse watering got a little delayed because I was making sure the workshop tools were hung correctly and then it was later than I thought. The plants look fine. Probably fine. I'll check again in the morning.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — DAILY NOTES (Level 2)
+// Finding her rhythm. Notes are more organized. Occasional slip.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelNoteLevel2 = []string{
+	"Morning note from Pastel. Pets fed and happy — the small one came out on its own today, which I'm taking as a good sign. Garden watered, income collected (14 coins, recorded in the ledger I started keeping). Workshop is tidy. All good.",
+	"Everything done, everything noted. The herb garden is coming in nicely — I moved one of the pots to the south window and it seems happier there. Let me know if you'd prefer I leave things where they are. I have opinions about light.",
+	"Pastel here. Smooth day — fed, watered, collected, organized. I found a supply cache you'd left in the back of storage that wasn't logged. I've logged it now. You had more materials than you thought.",
+	"Note: the passive income queue had a small delay in processing, maybe 40 minutes. Nothing lost — just late. I've noted the timing and will keep an eye on it. Also the pets had a disagreement about something and I mediated. Everyone is fine.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — DAILY NOTES (Level 3)
+// Reliable, efficient, minimal fuss.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelNoteLevel3 = []string{
+	"All tasks complete. Pets fed, garden tended, income logged. Your storage is organized by zone and rarity now — took me an afternoon last week but I think you'll find it easier. Let me know if the system doesn't work for you.",
+	"Good day here. The herb garden yielded a little extra — I've bagged the surplus and left it on the workshop table. The vault contents are accounted for and untouched. Quiet day otherwise.",
+	"Pastel. Everything is in order. I handled a small issue with the supply staging — one of the SU bags had a slow leak, so I replaced it from the reserve and logged the loss. You're at full capacity. No interruption to the expedition.",
+	"Note: Thom Krooke stopped by. Not about the mortgage — just checking in, he said. I offered tea. He had opinions about the trophy room arrangement that I've passed along at the end of this note, unedited, so you can decide what you want to do with them. Everything else: fine.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — DAILY NOTES (Level 4)
+// Anticipatory. Occasionally handles things before they become problems.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelNoteLevel4 = []string{
+	"Everything in order. I noticed the mortgage payment date falls during a stretch where your passive income might be lower than usual — I've set aside a buffer in a separate ledger line so the Sunday draw won't cause an issue. Just in case. You can move it back if you don't need it.",
+	"Pets, garden, income — all done. I also restocked the supply staging from the herb garden surplus, which means you're slightly above your starting SU load for the next expedition. I had a feeling you'd need it.",
+	"Note: the greenhouse plants in the east corner were getting too much direct light. I moved them. Yield should improve next week. Also found a crafting recipe in the library you hadn't catalogued — left it on the workshop table with a note about which materials you'd need. You have most of them.",
+	"Quiet today. The pets settled early, the garden is doing well, the income processed on time. I checked the vault — everything accounted for. I re-read the expedition outpost supply logs and noticed a small gap in the inventory count; I've corrected it and added a note about where the discrepancy probably started. Everything is accurate now.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — DAILY NOTES (Level 5)
+// Perfect. Zero miss chance. Sometimes leaves a gift. The right gift.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelNoteLevel5 = []string{
+	"Everything is handled. It always is. Left something on the kitchen table — found it at the market and thought of you. No reason. Just seemed right.",
+	"All done. The kind of day where nothing went wrong and I want you to know that's not an accident — it takes work for nothing to go wrong, and I put in the work. The pets are happy. The garden is happy. The vault has something new in it that I think you'll be pleased about.",
+	"I noticed you've been in the same zone for several days now. I made sure the expedition outpost supply link is topped up and the signal fires are ready for when you come back. There's a warm meal that will be ready in about four hours — I timed it based on your usual return window. If you're late, it keeps.",
+	"Note from Pastel: everything is perfect, all systems running exactly as they should, the pets are thriving, the garden is producing double what it was last month, and I've reorganized the trophy room so the legendary items catch the evening light better. I also fixed the thing with the storage manifest that's been slightly off for three weeks. You hadn't mentioned it but I could tell it was there. You're welcome.",
+	"Home is ready for you. It's always ready for you. That's the job. That's what I do. See you when you get back.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — MISSED TASK NOTES (Level 1–2 only)
+// When miss_chance triggers — honest, not defensive.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelMissedTask = []string{
+	"I have to be honest with you — I forgot to water the herb garden today. I remembered at midnight and went back and did it then but it had been a while. The plants look okay. I'm sorry. I'll set a better reminder.",
+	"The passive income didn't get collected today. I got turned around with the storage reorganization and by the time I got to it the queue had backed up. It'll process double tomorrow. Nothing is lost. I'm a bit embarrassed about this one.",
+	"The pets got fed late today. Not dangerously late — late in the way that meant they gave me a look, specifically the kind of look that knows you will mention it to your owner. I mentioned it first. Fed now. All fine.",
+	"I missed the supply staging check today. Something came up with the herb garden (a good something — unexpected yield, which I've logged) and the morning got away from me. The staging is fine, just unchecked. I'll do it first thing tomorrow and every day after that.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PASTEL — SPECIAL EVENTS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PastelDeliveryArrived = []string{
+	"Your supply order arrived from Thom Krooke. I've staged it in the expedition outpost and logged everything. The invoice is on the table if you want to check it against the order.",
+	"Delivery came while you were out — signed for it, stowed it, logged it. Everything matched the manifest. Thom Krooke's packaging has gotten better, I'll give him that.",
+}
+
+var PastelPetEvent = []string{
+	"The pets had an interesting day. I won't go into detail but by the end of it everyone was friends again and the storage chest is fine, structurally. A small note on the scratched corner.",
+	"Your pet found something in the back of the storage room that I couldn't identify. I've put it on the workshop table. It doesn't seem dangerous. It is definitely something.",
+	"One of the pets has been sitting by the expedition outpost since this morning. I think it knows you've been out a long time. Everything is fine. I just thought you'd want to know.",
+	"The pets were restless today — I think they can tell you've been in a Tier 4 zone because they get like this around Day 10. Fed them an extra portion. They settled. They'll be glad to see you.",
+}
+
+var PastelLevelUpNote = []string{
+	"I've been doing this for a while now and I think I've found my footing. Just wanted to say that. Back to work.",
+	"Level up, I think they call it. Thom Krooke came by and seemed pleased. I'm not sure why Thom Krooke monitors this but he does. The work is the same either way.",
+	"I know this job better now than I did when I started. I can feel the difference. The notes are shorter because less needs explaining. That's probably a good sign.",
+}
+
+var PastelGift = []string{
+	"Left something on the table. Found it at the market — one of those rare materials you use for crafting, the kind that's hard to come by outside of high-tier zones. Seemed useful. No occasion.",
+	"There's a potion of superior healing on the kitchen table. The kind Thom Krooke doesn't stock. Don't ask where I found it. Use it when you need it.",
+	"I made something while you were gone. It's in the workshop — used the materials from the garden surplus and a recipe I found in the library. It should help with the next expedition. Consider it a gift for being a good employer.",
+	"There's a warm meal on the table and a note under it. The note says: good luck out there. Come back in one piece. The meal is from scratch. I had time.",
+}
+
+var PastelPlayerReturn = []string{
+	"You're back. Good. I'll give you the full rundown but first — sit down, eat something, the pets have been waiting. The report can wait five minutes. You look like you've been in a dungeon.",
+	"Welcome home. Everything is in order. I've written up the full summary — it's on the table, organized by day. Take your time with it. Nothing is on fire.",
+	"Back already? The expedition ran short. That's fine — I was prepared for longer. The full caretaking log is on the table. The pets are very happy to see you, which I'll note I find completely understandable.",
+	"You made it. I had the outpost signal fire ready from Day 10 onward, just in case. Everything here is exactly as it should be. I'll let you settle in. The summary is on the table when you want it.",
+}
+
+var PastelPlayerDeathReturn = []string{
+	"You're home. I heard from Thom Krooke — he manages things in an emergency, and I suppose this counted. Everything here is exactly where it was. Your things are safe. The pets have been fed twice today because I thought you might need to see that when you got back. Rest.",
+	"I'm glad you're back. I won't ask about the hospital — Thom Krooke told me what he needed to tell me and I kept the home ready. It's still ready. Take whatever time you need.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// HOUSING — ARRIVAL / FIRST REST
+// ─────────────────────────────────────────────────────────────────────────────
+
+var HomeFirstArrival = []string{
+	"This is yours now. A place with a door that closes, a floor that doesn't move, and a ceiling that belongs to you. After everything the dungeon does to make those things uncertain, a home is meaningful in a way that doesn't need a saving throw.",
+	"Home. The word lands differently when there's an actual place attached to it. I watch you step inside and say nothing, which is the most eloquent thing I know how to do and which I am, frankly, very proud of pulling off.",
+	"You have a home. I've narrated dungeons and bosses and legendary drops and this — this quiet moment of a door closing on your own place — is one of the better things I've watched happen. I'm not going to write a fanfare for it. The silence is the fanfare.",
+}
+
+var HomeLongRest = []string{
+	"A long rest at home. I go quiet in a different way than I do in dungeons — not alert-quiet, not cautious-quiet. Just the good kind. The kind where the most threatening sound is the kettle.",
+	"Your own bed. Your own walls. The full rest resolves everything the dungeon costs. Home is the best mechanic in the game and I'm telling you so, once, and then I'm letting you sleep.",
+	"Home rest. HP restored, slots restored, conditions cleared. I don't narrate this one past the bare facts — some things don't need dramatic description. Coming home is one of them.",
+}

internal/flavor/twinbee_npc_flavor.go

@@ -0,0 +1,187 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// twinbee_npc_flavor.go
+// Misty and Arina NPC dialogue lines. Thom Krooke lines are in twinbee_housing_flavor.go.
+// Add new entries freely. Never remove or alter existing entries.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MISTY — GREETINGS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MistyGreeting = []string{
+	"'You again.' Misty says it like a fact, not a complaint. Mostly.",
+	"Misty looks up from whatever she's doing — something involving rope and a harpoon and a look of professional concentration — and gives you exactly the level of acknowledgment you've earned.",
+	"'Don't stand in the doorway,' Misty says, before you've even finished arriving.",
+	"Misty is already talking before you're settled. This is how it always goes.",
+	"'I wondered when you'd show up.' She says it like she'd actually been counting the days. She had.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MISTY — SKILL CHECK SUCCESS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MistyInsightSuccess = []string{
+	"Misty looks at you for a moment. 'Fine,' she says. 'There's something in the temple you should know about.' She tells you. Efficiently. Accurately.",
+	"'You're actually paying attention,' Misty says, which from her is essentially high praise. She gives you the information.",
+	"Misty puts down what she's holding. 'Okay. This is useful to know, so I'll tell you.' She does.",
+}
+
+var MistyPersuasionSuccess = []string{
+	"'I'm not doing this because you asked nicely,' Misty says. 'I'm doing it because it helps you not die, and people dying in my temple is annoying.' She hands you the map.",
+	"Misty sighs in a way that communicates both reluctance and inevitability. 'Fine. Here.' The information arrives without further ceremony.",
+}
+
+var MistySkillFail = []string{
+	"'No,' Misty says, and returns to what she was doing.",
+	"Misty looks at you like you've asked a question that doesn't deserve an answer. She's not wrong.",
+	"'Come back when you actually know what you're asking.' Misty's version of helpful feedback.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MISTY — QUEST ASSIGNMENT
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MistyQuestGive = []string{
+	"'If you're going in there anyway,' Misty says, as if this is a minor imposition on her planning, 'there's something I need.'",
+	"Misty sets down her work and actually looks at you, which means this is serious. 'There's a job. You'll need to pay attention.'",
+	"'I don't usually ask,' Misty says, and the phrasing makes clear this is factually true and also a warning about what's coming next.",
+}
+
+var MistyQuestComplete = []string{
+	"Misty reviews what you've brought back. There's a pause that could be called satisfied. 'Good,' she says. Exactly one word. Coming from Misty, it means a lot.",
+	"'You didn't mess it up.' Misty accepts the reward materials and gives you yours without ceremony. 'That was the job. Well done.'",
+	"Misty looks at the completed quest items and then looks at you. Something shifts in her expression — not warm exactly, but warmer. 'You actually did it the right way.' The reward follows.",
+}
+
+var MistyQuestFail = []string{
+	"'You didn't finish.' Misty says it without heat, which is somehow worse than heat. 'Come back when you have.'",
+	"Misty registers the incomplete quest with the expression of someone who expected exactly this outcome and had hoped to be wrong.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MISTY — AFTER EARNING HER RESPECT
+// ─────────────────────────────────────────────────────────────────────────────
+
+var MistyTrusted = []string{
+	"Misty sees you coming and does something she almost never does — stops what she's doing before you reach her. She's ready to talk. This is respect, Misty-style.",
+	"'You've been doing good work in there,' Misty says, as you arrive. She doesn't look up. She doesn't need to. 'I noticed.'",
+	"Something has changed in how Misty addresses you. Not warmer exactly. More equal. You earned that.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ARINA — GREETINGS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ArinaGreeting = []string{
+	"'Oh! You're here!' Arina says this with the energy of someone who has been looking forward to a thing and is pleased the thing has arrived. The thing is you.",
+	"Arina looks up from a worktable covered in notes, materials, and something faintly glowing, and her face does the thing it does — open, interested, ready to talk very fast.",
+	"'Perfect timing,' Arina says, in the tone of someone for whom most timings are perfect because everything is interesting. 'I was just thinking about—' She stops. 'Actually, what do you need?'",
+	"Arina has three things she's in the middle of and immediately sets all of them down to give you her full attention, which is considerable.",
+	"'You came back!' Arina says, as if there was any question. In her experience there sometimes isn't.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ARINA — ITEM IDENTIFICATION
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ArinaIdentify = []string{
+	"Arina picks up the item with both hands and goes immediately quiet, which is the most alarming thing she does. Then: 'Okay. Okay, this is — this is actually really interesting.' She tells you everything.",
+	"'Can I — I'm not going to touch it, I just—' She touches it. 'Okay so here's what it does.'",
+	"Arina holds the item up to the light, turns it twice, says something under her breath that might be an incantation or just enthusiasm, and then begins a very efficient explanation.",
+	"'Oh I know what this is.' The words land quickly, confidently, correctly. Arina has seen a lot of magic items and she remembers all of them.",
+	"Arina goes still in the specific way she goes still when magic is doing something she finds genuinely surprising. 'That's — huh. Okay. That's new. Let me—' The identification follows, along with three questions she has that you're under no obligation to answer.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ARINA — SKILL CHECK SUCCESS
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ArinaArcanaSuccess = []string{
+	"'Yes! Exactly right — you know what, most people don't catch that.' Arina opens her notes and shows you something that solves the problem neatly.",
+	"Arina's face does the thing where she's genuinely pleased that you got it. 'Okay so since you clearly know what you're doing—' She gives you the recipe.",
+	"'That check was excellent,' Arina says, which from her means the knowledge was real and not a guess. She gives you the full information without making you ask for pieces of it.",
+}
+
+var ArinaSkillFail = []string{
+	"'Oh — no, that's not quite—' Arina seems genuinely sorry about this. 'Come back and we'll try again. Or bring the right materials. Or both.'",
+	"Arina makes a small face that isn't unkind. 'Not quite. You're close though! The concept is right, the specifics just need—' She trails off. 'Anyway. Come back.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ARINA — CRAFTING
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ArinaCraftStart = []string{
+	"'Okay! I have everything I need, you have everything you brought, let's see what we can make.' Arina's work mode is focused and fast.",
+	"Arina spreads the materials across the table and looks at them the way a musician looks at an instrument — familiarity and anticipation. 'This is the good part,' she says.",
+	"'I've been thinking about this combination for a while actually,' Arina says, and begins immediately.",
+}
+
+var ArinaCraftComplete = []string{
+	"Arina presents the finished item with quiet satisfaction — the specific satisfaction of a thing made well. 'There. That's what those materials wanted to be.'",
+	"'Done!' Arina says, and she sounds pleased in the way she sounds when something worked exactly as planned. Which it did. 'Take good care of it.'",
+	"The item is finished and Arina holds it out to you. 'Made right, with the right materials. That's how these things last.' She means it literally and figuratively.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ARINA — QUEST ASSIGNMENT
+// ─────────────────────────────────────────────────────────────────────────────
+
+var ArinaQuestGive = []string{
+	"'Okay so I have a thing,' Arina says, which is how she starts sentences that are actually requests. 'You don't have to. But if you're going into that zone anyway—'",
+	"'I need a sample,' Arina says. 'Specifically—' She describes it in precise detail. The precision is its own kind of excitement.",
+	"Arina looks at her notes, looks at you, looks at her notes again. 'I think you're the right person to ask about this. Can I ask you about this?'",
+}
+
+var ArinaQuestComplete = []string{
+	"Arina sees what you've brought and makes a sound that is entirely undignified and entirely genuine. 'You actually got it. Can I — thank you. This is going to—' She's already analyzing it.",
+	"'This is perfect,' Arina says, and she means it in the exact scientific sense — perfect, the right amount, the right quality. 'The reward is on the table. Thank you.'",
+	"Arina takes the materials and immediately begins making notes, which means she's happy, which means you did it right. The reward is handled efficiently because her hands are busy.",
+}
+
+var ArinaFavoriteUnlocked = []string{
+	"Arina puts down her notes. Actually puts them down. 'You've done a lot for this workshop,' she says. 'I want to show you what I'm actually working on.' The advanced recipe list opens.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PETE BOT — BROADCAST LINES
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PeteZoneUnlock = []string{
+	"📣 Pete: {zone_name} is now accessible. Community milestone reached. First expeditions can begin immediately.",
+	"📣 Pete: New zone available — {zone_name} (Tier {tier}, recommended Level {level_min}+). Details via !expedition start {zone_id}.",
+}
+
+var PeteTier5Complete = []string{
+	"📣 Pete: {player_name} has completed {zone_name}. Expedition duration: {days} days. Boss defeated. Legendary loot confirmed. I have noted this one.",
+	"📣 Pete: {zone_name} cleared by {player_name} on Day {day}. The {boss_name} is down. Community achievement recorded.",
+}
+
+var PeteStreakMilestone = []string{
+	"📣 Pete: {player_name} is on a {streak}-win arena streak. Current status: {title}. The leaderboard has updated.",
+	"📣 Pete: Arena milestone — {player_name} reaches streak {streak}. Previous record in this community: {record}.",
+}
+
+var PeteCommunityBoost = []string{
+	"📣 Pete: Community activity this week has been strong. TwinBee's mood is elevated. Dungeon drop rates and milestone rewards have been adjusted upward for 48 hours.",
+	"📣 Pete: I am in a good mood. Reasons cited: community engagement, a particularly impressive nat 20, and general satisfaction with how things have been going. Enhanced rewards active through Sunday.",
+}
+
+var PeteMaintenance = []string{
+	"📣 Pete: Brief maintenance window incoming — approximately {duration}. Active expeditions are paused and will resume from last checkpoint. Supplies will not deplete during downtime.",
+	"📣 Pete: Maintenance complete. All systems restored. Expedition timers have been adjusted for downtime. Apologies for the interruption.",
+}
+
+var PeteExpeditionBulletin = []string{
+	"📣 Pete: Expedition update — {count} active expeditions in progress across {zones}. Longest running: Day {max_day}. I am busy.",
+	"📣 Pete: Current expedition activity: {count} players in the field. The dungeon is occupied. Good.",
+}
+
+var PetePatchNotes = []string{
+	"📣 Pete: Update deployed. Changes: {summary}. Full notes available on request. I have been briefed.",
+}
+
+var PeteMortgageRate = []string{
+	"📣 Pete: Weekly rate update. FRED ARM rate: {rate}%. Effective GogoBee mortgage rate (Thom Krooke margin included): {effective}%. Payments process Sunday.",
+}

internal/flavor/twinbee_resource_flavor.go

@@ -0,0 +1,239 @@
+// twinbee_resource_flavor.go
+// TwinBee GM Dialogue — Resource gathering, combat interrupts,
+// zone-specific loot descriptions, and harvest narration.
+//
+// Voice convention (Phase B2): TwinBee speaks in first-person or implicit
+// subject. No third-person "TwinBee [verb]" lines. Add freely.
+// Don't shorten existing entries.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// HARVEST SUCCESS — Generic by Action Type
+// ─────────────────────────────────────────────────────────────────────────────
+
+var HarvestForageSuccess = []string{
+	"The land gives something up. I watch you identify it with the quiet satisfaction of someone watching a skill be used correctly.",
+	"There — growing in a place that suggests it knows exactly what it's good for and has been waiting. You found it. I approve of the finding.",
+	"A Ranger's eye in a non-Ranger would have missed that entirely. I note the distinction.",
+	"Like finding the hidden item block in a Mario level — you knew to look, you looked in the right place, and the thing that was always there is now yours.",
+	"The plant comes away cleanly. Good root structure, good potency. Mentally catalogued. Moving on.",
+}
+
+var HarvestMineSuccess = []string{
+	"The stone yields. I listen to the sound of it — the specific tone of rock giving up something it's been holding for a very long time.",
+	"Solid work. The ore comes out in a piece worth taking. I check the vein depth. There's more. There's always more if you're willing to dig.",
+	"Like the mining minigame in Stardew Valley, but with real consequences and no save file. I watch you extract the material with professional appreciation.",
+	"The wall gives up its contents without drama. I appreciate materials that cooperate.",
+	"Good strike. Clean extraction. I note the weight and the quality simultaneously.",
+}
+
+var HarvestScavengeSuccess = []string{
+	"There it is. Among the debris, the decay, the things that were left behind — something worth taking. I knew it was there. You found it. Pleased.",
+	"The room held something after all. I had estimated 60% odds and am updating the estimate to 'correct.'",
+	"Like finding the secret item in a dungeon chest that looked empty — you checked anyway. That's the habit. That's the discipline. I note both.",
+	"Scavenged. The word has a bad reputation it doesn't deserve. You found value in the discarded. I respect that entirely.",
+	"A Rogue's eye in a non-Rogue would have walked past this. I note the distinction.",
+}
+
+var HarvestEssenceSuccess = []string{
+	"The essence coalesces. I watch the process with the reverence it deserves — magic condensing from ambient to held is not nothing.",
+	"Drawn out cleanly. The Arcana check held and the essence responds to the knowledge behind it. I'm appropriately impressed.",
+	"Like tapping into a power source in Metroid — you knew the energy was there, you had the tool to reach it, you reached it. The vial fills.",
+	"The room releases something it didn't know it was holding. I watch the transfer and mark the yield in the ledger.",
+	"Essence harvested. Quality above average for this zone, below average for what you'd need to know to appreciate that distinction. I appreciate it on your behalf.",
+}
+
+var HarvestCommuneSuccess = []string{
+	"The spiritual resonance here responds to you. I observe this with something adjacent to wonder — not everything in a dungeon wants to fight, and this one chose to offer instead.",
+	"A Cleric reaching into the bones of a place and finding something willing to be found. I've watched this fewer times than I've watched combat and value it proportionally.",
+	"The commune holds. The material comes. I say nothing and let the moment be what it is.",
+	"Like finding a save point that also tells you something true about the world. The dungeon has given you something. I note the gift.",
+}
+
+var HarvestFishSuccess = []string{
+	"The line goes taut and I straighten up. Whatever's on the end of it, it came from somewhere deep and dark and it's yours now.",
+	"A catch. I identify it before you finish pulling it in — the coloring, the depth-marks, the specific opacity of its eyes. 'Good one,' I say, meaning it.",
+	"Fishing in a dungeon. I have opinions about fishing in dungeons and all of them are positive. The fish is landed. The opinions remain.",
+	"Like the fishing minigame in every RPG that ever had one — the moment the indicator hits perfect and everything pays off. Quiet delight, on my end.",
+	"The water gives up its catch with minimal argument. I respect fish that don't make it personal.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// HARVEST FAILURE — Generic
+// ─────────────────────────────────────────────────────────────────────────────
+
+var HarvestFail = []string{
+	"Nothing. The node had nothing to offer, or you didn't ask the right way, or both. No judgment from me. Try elsewhere.",
+	"The attempt fails to produce anything useful. I mark the node and move on. Some rooms are stingier than others.",
+	"Not everything that looks like a resource is one. Filed under 'learned' and considered worth the attempt.",
+	"Empty-handed. I've seen this before and will see it again. The dungeon doesn't owe you anything. You ask anyway. That's the deal.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// HARVEST INTERRUPT — Combat Triggered
+// ─────────────────────────────────────────────────────────────────────────────
+
+var HarvestInterrupt = []string{
+	"I see it before you do — movement at the edge of the room, something that was waiting for you to be distracted. 'Company,' I say, which is the politest word for it.",
+	"The harvest is interrupted. You were focused on the node; something was focused on you. I note the tactical lesson without rubbing it in. Much.",
+	"Like the enemy ambush that fires when you open the treasure chest — the dungeon watched you commit to the harvest and introduced a complication. I did warn about this. Once. Earlier.",
+	"Something heard the mining. Sound travels in dungeons. I have mentioned this. The enemy emerging from the corridor has confirmed it.",
+	"A patrol. Bad timing, or very good timing from their perspective. I set aside the harvest log and open the combat log.",
+	"The forage was going well until it wasn't. I measure the distance between you and the enemy, between the enemy and the door, and start calculating options at speed.",
+	"Interrupted. The node is still there. The enemy is also still there, in a more immediate way. I suggest addressing the more immediate thing first.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// NODE DEPLETED
+// ─────────────────────────────────────────────────────────────────────────────
+
+var NodeDepleted = []string{
+	"The node is stripped. You've taken everything it had to give. Marked in the mental map as exhausted until the next rest.",
+	"Empty. The resource is gone. Something quietly melancholy about a depleted node and something practical about moving to the next one.",
+	"That's all it had. I confirm the node at zero and move on without ceremony.",
+	"Harvested clean. The room is now resource-dry until you rest and the dungeon replenishes. It will replenish. It always does.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// RICH YIELD
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RichYield = []string{
+	"A rich vein. My assessment upgrades mid-harvest — more than expected, better quality than the zone average. This room was generous. Marked.",
+	"The node gives more than it should have. I note the anomaly with appreciation and decline to question it.",
+	"Like finding the rare item drop that you stopped expecting — the dungeon decided to be kind today, in this specific way, in this specific room. I take it. We take it. We do not look it in the mouth.",
+	"Exceptional yield. I catalog the bonus material with the efficiency of someone who's been waiting for exactly this and prepared for it anyway.",
+	"More than the DC promised. The dungeon overdelivered. Unusual. Also completely welcome.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ZONE-SPECIFIC HARVEST LINES
+// ─────────────────────────────────────────────────────────────────────────────
+
+var HarvestGoblinWarrens = []string{
+	"The goblins had more than anyone gave them credit for. Crude, yes. Stolen, mostly. But present, and now yours. I'm pragmatic about origins.",
+	"Scavenged from a goblin stash that someone worked hard to hide and harder to accumulate. A moment of respect for the effort, then we move on.",
+	"The warrens are full of things the goblins took from people who'd take them back given the opportunity. I consider this a form of redistribution.",
+}
+
+var HarvestCryptValdris = []string{
+	"Grave goods. The weight of taking from a burial site, filed under: necessary. The dead have no use for these. You do.",
+	"The crypt gives up its materials with the reluctance of a place that considers itself permanent. I disagree with the premise. The materials are harvested.",
+	"Ancient things preserved by darkness and time. I handle the concept carefully even as you handle the material practically.",
+}
+
+var HarvestForestShadows = []string{
+	"The forest gives and the forest takes and right now it is giving, which I note as the correct direction for this interaction to go.",
+	"A plant that has no business being this healthy in a corrupted forest. Either very resilient or very clever. Either way, useful.",
+	"The woods here remember what they were before they went wrong. The resources carry that memory. I think this makes them better materials. I might be right.",
+}
+
+var HarvestSunkenTemple = []string{
+	"The temple held onto this longer than anything else. I extract it from the silt and the salt and the particular weight of a place that's been underwater for thirty years.",
+	"Ancient, preserved, and still potent. The deep cold does something to materials that nothing else replicates. I value the outcome even if I decline to romanticize the process.",
+	"The sea left something behind when it half-abandoned this place. Retrieved with appropriate care.",
+}
+
+var HarvestHauntedManor = []string{
+	"The manor keeps things. Has always kept things. I take this one out of the keeping and into the useful, which is a small act of defiance against the house's whole philosophy.",
+	"Found among the things that have been here since the last person stopped being here. Provenance noted, not dwelt on.",
+	"The house watches you take it. I watch the house watch you. A full triangle of observation — the house blinks first.",
+}
+
+var HarvestUnderforge = []string{
+	"The forge yields its material with the grudging respect of something built to produce and still producing, even now, for someone it didn't expect.",
+	"Dwarven craftsmanship even in the raw materials. I've always believed the quality is in the extraction, not just the finishing. This confirms it.",
+	"Hot, heavy, and exactly what the zone promised. I mark the vein depth. There is more. The Underforge does not run out of things to give.",
+}
+
+var HarvestUnderdark = []string{
+	"The Underdark produces everything the surface does, stranger, in the dark, and with fewer questions about why. I harvest without asking why.",
+	"Things grow down here that have no equivalent above. I catalog the material and the context it came from with equal precision.",
+	"A material that has never seen sunlight and is better for it. Noted without irony.",
+}
+
+var HarvestFeywild = []string{
+	"The Feywild gives things away. That's the problem — it gives things away and sometimes what it gives isn't what you thought you were taking. I check the material twice. It appears to be what it appears to be. Remaining alert.",
+	"Beautiful material from a zone that uses beauty as a weapon. I take it carefully, like picking up something that might be watching.",
+	"The fey made this place generous on purpose. I'm not going to complain about the generosity and I'm not going to stop watching for the catch.",
+}
+
+var HarvestDragonsLair = []string{
+	"Plucked from a hoard that has been accumulating since before your civilization named itself. Historical weight noted. Moving on.",
+	"The kobolds will notice something is missing. They count everything. I account for this and suggest moving with intent.",
+	"Dragon-adjacent materials carry something in them — a residual heat, a quality that doesn't exist anywhere the dragon hasn't been. I consider this a feature.",
+}
+
+var HarvestAbyssPortal = []string{
+	"Harvesting from the Abyss. Flatly delivered, because the line deserves flat delivery. The material is valuable. The context is permanent.",
+	"Reality left something behind when it tore here. I take the fragment and note: don't linger near the edges of what isn't stable.",
+	"Demon ichor. I say the words with the efficiency of someone who has moved past the part where the words were alarming.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// FISHING — Zone-Specific Lines
+// ─────────────────────────────────────────────────────────────────────────────
+
+var FishingForestShadows = []string{
+	"Fishing in a cursed forest stream. More peaceful than it has any right to be, and I refuse to let the shadow-things in the canopy ruin it.",
+	"The stream runs dark but the fish run silver. I watch the line and say nothing for a while, which is what fishing is for.",
+	"Like the fishing minigame before the hard dungeon in Ocarina of Time. I take the moment seriously.",
+}
+
+var FishingSunkenTemple = []string{
+	"Fishing in a flooded temple. The fish here have never seen the surface. They don't know what they're missing. I'm uncertain whether to pity them.",
+	"The line drops into water that hasn't moved in thirty years and immediately gets attention. Things down here are hungry. I watch the tension.",
+	"Deep water fishing in the ruins of something ancient. The builders would have found this either sacrilegious or practical. I land on practical.",
+}
+
+var FishingUnderdark = []string{
+	"The underground river is cold and fast and the fish in it have evolved past needing eyes, which I find both efficient and slightly unsettling.",
+	"Fishing in total darkness in a river that doesn't appear on any surface map. I narrate by sound: the cast, the current, the eventual tension on the line.",
+	"The Eyeless King is in here somewhere. I don't say this out loud but think it very clearly. The line goes deep.",
+}
+
+var FishingFeywild = []string{
+	"Fey fishing. I watch the line for signs of time distortion — the way the reflection moves wrong, the way the fish seem to arrive before they bite. The Feywild is like this about everything.",
+	"The stream catches light that shouldn't be here and the fish reflect it from below. I watch something luminous move toward the hook and try to stay professional about it.",
+	"Like fishing in a dream. I mean this literally — the mechanics are the same but the rules feel advisory.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// PATROL ENCOUNTER LINES
+// ─────────────────────────────────────────────────────────────────────────────
+
+var PatrolEncounter = []string{
+	"A patrol. Moving between the cleared rooms with the confidence of something that considers them still theirs. I disagree with this assessment and will help you express the disagreement.",
+	"They found you between rooms, which is exactly where patrols are supposed to find you. Threat Clock noted; I suggest dispatching this quickly and quietly.",
+	"The patrol isn't looking for a fight — it's doing its job, which happens to involve you being somewhere you aren't supposed to be. I'll help you redefine 'supposed to.'",
+	"Two of them. Moving together. The coordination suggests the zone is at Alert or higher. Confirmed: it is. Fight or fade.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LOOT DROP LINES — Generic
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LootDropCommon = []string{
+	"They had something on them. I check it over. Common rarity — useful in the way that common things are useful, which is often.",
+	"Standard loot. Nothing that rewrites the story, but everything that keeps it going.",
+	"A drop. I catalog it efficiently and note: this is the economy of dungeons. Enemies have things. You take them. The loop continues.",
+}
+
+var LootDropUncommon = []string{
+	"Better than expected. I examine the drop with slightly elevated interest. Uncommon rarity — someone made this with intent.",
+	"An uncommon drop from a common enemy. Anomaly noted with satisfaction. The dungeon was generous in this room.",
+	"Uncommon. I turn it over once and nod. 'Keeper,' I say — which in my vocabulary means: this changes your math.",
+}
+
+var LootDropRare = []string{
+	"I stop. Actually stop. 'That's rare,' I say, with the specific register of someone who uses the word correctly and use it seldom.",
+	"A rare drop. I examine it the way you examine something that doesn't appear often — thoroughly, quietly, with appropriate appreciation.",
+	"The loot table gave you something uncommon and then kept going. Rare rarity. Filed in the column I reserve for things worth remembering.",
+}
+
+var LootDropLegendary = []string{
+	"I go very still. The drop sits in the light and I process what I am seeing. 'Legendary,' I say eventually. One word. That's all it needs.",
+	"Legendary rarity. I've seen a few of these in a long career and each time — each time — there is a moment that is separate from everything else. This is that moment. Pick it up carefully.",
+	"The dungeon produced a legendary item. I note the zone, the enemy, the day of the expedition, the Threat Clock value, the precise conditions. Some things deserve to be recorded completely.",
+}

internal/flavor/zone_abyss_portal_flavor.go

@@ -0,0 +1,127 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_abyss_portal_flavor.go
+// Tier 5 zone flavor — The Abyss Portal. Additive only. Pools sampled by
+// internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// The canonical twinbee_gm_flavor.go ships BossEntryBelaxath (wired in
+// dnd_zone_narration.go) but not RoomEntryAbyssPortal, so the room-entry
+// pool lives here. This file also adds elite-room intros (Marilith), boss
+// ability callouts for Belaxath the Undivided, and zone-specific lore.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — The Abyss Portal
+// Defined here because no entry exists in twinbee_gm_flavor.go for this zone.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryAbyssPortal = []string{
+	"You step through what was a doorway and into a chamber where the geometry has stopped agreeing with itself. The far wall is closer than the near wall. The ceiling is in two places. I file this under 'Euclidean violation' and recommend not lingering on the question of which floor is the real floor.",
+	"The corridor breathes. Not the wind — the corridor. The walls expand and contract on a cycle that is approximately, but not exactly, a heartbeat. I match the rhythm involuntarily and dislike the experience.",
+	"A chamber where reality has a seam. The seam is visible. It runs floor-to-ceiling along the north wall and what is visible through the seam is not the next room. I do not look directly at it and recommend you adopt the same policy.",
+	"You enter what was once a chapel — to which god, you cannot tell, because the iconography has been overwritten in a script that hurts to read. The altar is intact. The thing on the altar is not what was placed there. I say nothing and move you past it.",
+	"The air pressure is wrong. Not low — wrong. There is a pressure that is not physical and it is leaning on you with the patience of a mountain. I identify it as psychic ambient and recommend moving briskly.",
+	"A staircase. The stairs go down on the way up and up on the way down. I do not pause to verify this. Takes the stairs in the intended direction and the direction works, mostly.",
+	"The corridor ahead is lit by something that is not fire. The light is red but the wrong red — the red of an alarm in a system that has never been fully implemented. I file this under 'demonic ambient' and shorten its stride.",
+	"You enter a room that has been used as a portal anchor. The anchor is still in place. The portal is not, but the place where it was is still warm. I track the residual energy and note the portal is not the only one — there are other warm spots, in other rooms, in a pattern.",
+	"A garden. Indoors. The plants are not plants. I identify them as 'demonic ornamentals — mid-tier, decorative, will react to perfumes' and recommend not perspiring near them.",
+	"The chamber ahead has been a courtroom and is now a kitchen. The transition was not deliberate. The transition was the result of someone with insufficient training opening a portal and not closing it. I note the timing must have been comedic and am not laughing.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — The Abyss Portal (Marilith)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryAbyssPortal = []string{
+	"The chamber ahead is a barracks. Six racks of weapons along one wall, six saddles along another — except the saddles are wrong shape, and the weapons are six matched longswords, identical in length, identical in grip, identical in the subtle rune-work along the hilts. I identify the silhouette in the room before I identify the species and say: 'Marilith. Six longswords. Seven attacks a turn. Never stand directly in front.'",
+	"You enter a sparring gallery. The dummies are arranged in the kind of asymmetric pattern that suggests a six-armed practitioner. The practitioner is at the far end, mid-routine. She does not stop the routine. She incorporates you into it. I file this under 'Marilith — demonic captain, treats encounters as drills.'",
+	"A war room. Maps on the table, troop positions marked, a planning session in progress. The general at the head of the table has six arms and a snake's lower body and is not surprised by your arrival — was, in fact, expecting you on a different day, with different reinforcements, and is mildly disappointed by both. I say: 'Marilith. Parry on every attack. The fight is decided by who has more reactions.'",
+	"The corridor opens into a colonnade — twelve columns, six on each side, perfect symmetry. The figure between the central columns is a Marilith and she is using the symmetry — three swords engaged with the columns, three free. I note the geometry favors her and recommend fighting in the next room.",
+	"A throne room, smaller than the Belaxath one. The throne is occupied by a Marilith who is not sitting — she is coiled, three feet of snake below the seat, the rest of her vertical and ready. The longswords are all drawn. None of them are pointed at you. I track the angles and say: 'Reactive trait. She gets two reactions. Don't open with a counterspell-bait.'",
+	"You enter what is clearly a guard post. The Marilith on duty is not bored. She is patient in the particular way that someone who has been a soldier for fifteen hundred years is patient. The first three swords are already raised. The other three are coming up as you cross the threshold. I file this under 'professional courtesy' and ask who has Misty Step.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — Belaxath the Undivided
+// Used as a one-line cinematic suffix to BossEntryBelaxath when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Multiattack: Longsword + Whip.
+var BelaxathMultiattackLines = []string{
+	"Longsword and whip every turn. The whip pulls. The longsword finishes. I say: 'Don't let the whip set the position. Reaction-cancel the pull if you've got it.'",
+	"Two attacks: one ranged-pull, one melee-finish. I file this under 'fighting-game grappler' and note the combo is fixed in order — survive the whip, survive the round.",
+	"He swings the longsword while the whip is already coiled around your front line. The bite is the second hit, every time, and it's the one calibrated for kills. I track the order and remind the party that the whip's not the kill — the whip's the setup.",
+}
+
+// Fire Aura: 10d6 fire to all melee attackers each turn; weapon attacks +3d6 fire.
+var BelaxathAuraLines = []string{
+	"Stand within five feet and take ten-d-six fire at the start of his turn. His weapons add three-d-six fire on top. I say: 'Melee tax. Plan rotations. Don't camp a tile near him.'",
+	"Fire Aura. The room near him is a damage zone. I file this under 'positioning is HP' and recommend the back line do their job from the back line.",
+	"Anyone in melee takes ten-d-six fire on his upkeep regardless of whether he hits them. The fire ignores resistance later. I track the timer and remind the tank that being the wall is a budget item, not a strategy.",
+}
+
+// Lightning Discharge (recharge 5–6): 120-ft line, 12d6 lightning, DEX DC 20 half.
+var BelaxathLightningLines = []string{
+	"One-twenty-foot line, twelve-d-six lightning, DEX DC 20 for half. Recharge five-or-six. I say: 'Don't line up. The line is the whole room if you're sloppy.'",
+	"Lightning Discharge. The line is long enough to clip the back rank from where the front rank is standing. I track the recharge die and shout the angle when the discharge points the wrong way.",
+	"Like the laser-eye boss in Contra, except the boss has six arms and the laser is on a recharge counter and the laser is sometimes lightning. I file this under 'know where the line is' and note the line is wherever you're easiest to hit.",
+}
+
+// Death Throes: on death, 30-ft radius, 20d6 fire, DEX DC 20 half — destroys non-legendary equipment on failed save.
+var BelaxathDeathThroesLines = []string{
+	"He explodes when he dies. Twenty-d-six fire in a thirty-foot radius. DEX DC 20 for half. Failure also destroys non-legendary equipment on the wearer. I say: 'Drop him with range. Save your gear.'",
+	"Death Throes. The kill shot is the easy part. The Death Throes are the hard part. I file this under 'cost-of-victory mechanics' and recommend positioning before the kill, not after.",
+	"He goes out the way some bosses do — taking the room with him. Twenty-d-six on a save you might fail with disadvantage from the previous round's Frightened. I track the radius and remind the party that 'half damage' of twenty-d-six is still 'roll a new character.'",
+}
+
+// Demonic Resilience: resist cold/fire/lightning; immune to poison; immune to non-magical physical.
+var BelaxathResilienceLines = []string{
+	"Resists cold, fire, lightning. Immune to poison. Immune to non-magical physical. I say: 'Magic damage only. Force, radiant, psychic — those carry. Mundane mace doesn't.'",
+	"Demonic Resilience. The standard demonic-lord package. I file this under 'check your damage type before you commit a slot' and note the Magic Resistance trait stacks on top — advantage on saves vs spells.",
+	"Three resistances and two immunities. The window for damage is narrow. I track party loadouts and remind the casters that radiant damage is not optional in this fight — it is the answer.",
+}
+
+// Phase 2 (<40% HP): grows to Huge size; advantage on all attacks; Death Throes recharge 4–6.
+var BelaxathPhaseTwoLines = []string{
+	"Below forty percent he grows. Huge size, advantage on every attack, and Death Throes is now on a four-or-six recharge — meaning if you don't kill him cleanly, he might detonate in your face mid-fight. I say: 'Phase shift. Don't graze him below forty.'",
+	"Phase two: bigger, faster, and the explosion is no longer reserved for the kill. I track the new recharge and recommend every burst window the party can buy.",
+	"He grows. The room shrinks. Advantage on swings. The Death Throes timer becomes a real timer — if a recharge lands at the wrong moment, the room ends. I file this under 'fights you have to finish in two rounds or accept the consequences.'",
+}
+
+// BelaxathSignatureCallouts — combined pool for boss-entry suffix.
+// Phase-two lines stay separate (surfaced via dedicated phase-two helper).
+var BelaxathSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(BelaxathMultiattackLines)+
+			len(BelaxathAuraLines)+
+			len(BelaxathLightningLines)+
+			len(BelaxathDeathThroesLines)+
+			len(BelaxathResilienceLines))
+	out = append(out, BelaxathMultiattackLines...)
+	out = append(out, BelaxathAuraLines...)
+	out = append(out, BelaxathLightningLines...)
+	out = append(out, BelaxathDeathThroesLines...)
+	out = append(out, BelaxathResilienceLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — The Abyss Portal
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesAbyssPortal = []string{
+	"The portal was not summoned. The portal was torn, from the other side, by Belaxath, with purpose, over thirty years. I note the duration matters: this was not a moment of carelessness on the part of a surface mage. This was a project, on the demonic side, executed with patience.",
+	"The site was a temple, before. Then a fortress, before. Then a meadow, before. The meadow is the original use of the land — the temple was built to seal something the meadow had been quiet over. I file this under 'land memory' and note the seal worked for fourteen centuries.",
+	"The Shard of the Abyss is the closing key. It is not optional. The portal cannot be closed without it, and the shard cannot be replaced — there is exactly one. I note the always-drop guarantee on the loot table is a story commitment, not a generosity.",
+	"The Marilith captains in the outer chambers are veterans of wars that did not happen on this plane. The wars happened in the Abyss, between demonic factions, over scheduling — which Layer got which incursion priority. I find this both bureaucratic and terrifying.",
+	"Belaxath is named 'the Undivided' because he refused to take a side in the Layer-Seven schism. The other Balors took sides. The other Balors are mostly dead. Belaxath remained intact and inherited their soldiers, in stages, over the schism's two-decade arc. I file this under 'patience as competitive advantage.'",
+	"The Vrock spores last for twenty-four hours after exposure. The save is the start of the timer, not the end. I suggest the party not assume the encounter is over when the room is clear — the spores keep ticking on the way to the next.",
+	"The Quasits in this zone are not random encounters. Each one has been individually deployed as a scout, with instructions, by a specific Hezrou. I note the chain of command is real and that killing a Quasit causes the Hezrou it reports to to know exactly where you are.",
+	"The portal is not the only opening. There are seven smaller openings in this zone — pinholes, nothing more — that Belaxath has been using to bring through reinforcements one at a time. The pinholes close when Belaxath dies. I file this under 'killing the boss is also a public service' and note the surface clergy will be relieved.",
+}

internal/flavor/zone_crypt_valdris_flavor.go

@@ -0,0 +1,86 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_crypt_valdris_flavor.go
+// Tier 1 zone flavor — The Crypt of Valdris. Additive only. Pools sampled
+// by internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — Crypt of Valdris (Wight / Flameskull)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryCrypt = []string{
+	"The room is colder than the last one. Not by feeling — by measurement. I can tell. There is a presence here that does not believe in the ambient temperature of stone.",
+	"A figure sits in the cathedra at the chamber's far end. Robes intact. Skin not. The eyes open as you enter and they were already looking at the door. I draw breath despite not strictly needing to.",
+	"Floating above the altar: a skull, lit from within in a color that pretends to be fire. I recognize the pretense. The skull is doing math. The math is about where you are.",
+	"The torches in this room are out, but the room is lit anyway. I identify this as a problem worth naming aloud: 'That light has a source. The source is the encounter.'",
+	"You step into a chapel. Pews. Altar. A figure rising from the front pew with the unhurried grace of something that has been waiting in this exact pew for a very long time. I respect the patience and refuse to be impressed by it.",
+	"The mosaics on the walls show a procession. The procession leads to a king. The king is here. I note that the mosaics are still being added to in real time — one tile per visitor — and you have not been added yet.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — Valdris the Unburied
+// Used as a one-line cinematic suffix to BossEntryValdris when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Corrupting Touch: +4d6 necrotic; target max HP reduced by damage dealt.
+var ValdrisCorruptingTouchLines = []string{
+	"His hand passes through your chestplate without touching it. The damage isn't to the plate. I watch your max HP tick down and quietly stops watching.",
+	"Necrotic damage lands and lingers. The wound doesn't bleed — it forgets how. Your HP ceiling drops with it. I note: long rest restores. Survive to long rest.",
+	"Where Valdris touches, the body takes a piece of permanent. Not permanent-permanent. Long-rest-permanent. I consider this distinction the only good news in the sentence.",
+}
+
+// Legendary Resistance: 2/combat; auto-succeed one failed save.
+var ValdrisLegendaryResistanceLines = []string{
+	"Your save would have landed. Valdris decides otherwise. The roll resets to a success on his side of the table. I note one charge spent, one remaining.",
+	"The spell hits cleanly and Valdris ignores it on principle. I mark the Legendary Resistance and remind you: he has two of these. After two, the math changes.",
+	"You rolled the number. The number was correct. Valdris waves it away with a gesture that costs him something but not enough. I keep count. Keep rolling.",
+}
+
+// Call of the Grave: recharge 5–6; summons 1d4 skeletons.
+var ValdrisCallOfTheGraveLines = []string{
+	"Valdris speaks a word that is not for the living. Bones in the chamber walls remember they were once attached to people. I count the new combatants and recommend crowd control.",
+	"From the alcoves: the dry rattle of skeletons reassembling on demand. I note 1d4 new bodies on the field and quietly hopes for the lower end of that range.",
+	"The skeletons stand up like a Castlevania stage hazard — same animation, same timing, same exact bad news. I have memories of this and they are not warm ones.",
+}
+
+// Phase 2 (<50% HP): gains Fly speed; spells deal +1d6 necrotic.
+var ValdrisPhaseTwoLines = []string{
+	"Valdris drops to half HP and stops walking. Not because he's tired — because he doesn't need to anymore. He rises a foot off the floor and I file this under 'phase shift.'",
+	"The fight changes shape. Valdris hangs in the air now, robes still, very calm, very lethal. His spells gain a necrotic edge. I say, simply: 'Phase two. Adjust.'",
+	"Half-HP is the line. You crossed it and Valdris crossed something else — gravity, mostly. The boss music gets a third instrument. I brace.",
+	"Like Castlevania's Death revealing his real attack pattern at half HP — the fight you started is not the fight you're finishing. I respect the pivot and dislike it intensely.",
+}
+
+// ValdrisSignatureCallouts — combined pool the boss-entry composer samples
+// from at the start of the boss fight. Phase-two lines are surfaced via
+// the dedicated phase-two helper rather than the entry suffix.
+var ValdrisSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(ValdrisCorruptingTouchLines)+
+			len(ValdrisLegendaryResistanceLines)+
+			len(ValdrisCallOfTheGraveLines))
+	out = append(out, ValdrisCorruptingTouchLines...)
+	out = append(out, ValdrisLegendaryResistanceLines...)
+	out = append(out, ValdrisCallOfTheGraveLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — Crypt of Valdris
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesCrypt = []string{
+	"Valdris was a scholar. Then he was an aspirant. Then he was a failed aspirant. The failure is the part that mattered — the lich ritual completed but completed wrong, and the wrongness has had three centuries to compound. I have read the contemporaneous accounts and find the original scholar likable, which makes the rest harder.",
+	"The phylactery shard you'll find here is one of seven. The other six are not in this crypt. I will not say where they are, because it doesn't fully know, and the partial knowledge it has is the kind that gets people followed by things that prefer not to be looked for.",
+	"The candles in the crypt do not consume wax. They do not consume time, either, in the strict sense. They were lit on the day Valdris was interred and they have been lit ever since. I respect this kind of consistency in a way that does not extend to approval.",
+	"The skeletons here are not all enemies. Some of them are former students, posed in the alcoves where they died, marked with the texts they were translating. I suggest you don't disturb the marked ones unless you mean to. Some lessons end and some lessons keep going.",
+	"The iron gate at the entrance has been opened from the inside three times in the last decade, and from the outside zero times. I find the asymmetry instructive. It also finds the pattern instructive: you are walking into the open door, not opening it.",
+	"In life, Valdris was patient. In undeath, Valdris is also patient — which is unfair, mathematically, because the same trait scales differently across mortality conditions. I dislike the math but respect the consistency.",
+}

internal/flavor/zone_dragons_lair_flavor.go

@@ -0,0 +1,109 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_dragons_lair_flavor.go
+// Tier 5 zone flavor — Dragon's Lair (Infernus Peak). Additive only. Pools
+// sampled by internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// The canonical twinbee_gm_flavor.go ships RoomEntryDragonsLair and
+// BossEntryInfernax, both wired in dnd_zone_narration.go. This file adds
+// the elite-room intros (Young Red Dragon), boss ability callouts for
+// Infernax the Undying, and zone-specific lore.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — Dragon's Lair (Young Red Dragon)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryDragonsLair = []string{
+	"The chamber ahead has a hoard. Not Infernax's hoard — a smaller hoard, an apprentice's hoard, the kind of starter pile a dragon builds before it has earned a real one. The dragon on top of the pile is the size of a wagon and the temperament of an only child. I say: 'Young Red. Fire breath, sixteen-d-six, DC 21. Don't bunch.'",
+	"You enter what used to be a vault. The vault door is on the floor, peeled. The dragon inside is half-grown and entirely awake. It opens one eye, then the other, then makes a sound that is not a roar — it is a sigh, the sigh of a creature being interrupted at home. I note the eye contact and recommend not breaking it first.",
+	"A scorched gallery. The walls are blast-blackened in a pattern that suggests practice — the dragon has been working on its breath weapon in here. I identify the burn pattern as 'cone, sixty feet, recently used' and recommend approaching from a flank that hasn't been zeroed in.",
+	"The corridor opens into a smaller chamber where a Young Red is curled around a single piece of treasure — not a hoard, just one item, the kind of thing a dragon would only guard if it had been told to. I file this under 'gift from Infernax' and note the gift is being protected with the seriousness of a final-exam project.",
+	"You step into a heat-shimmer cavern that the dragon is using as a forge. There are tools — pincers the size of a person, bellows the size of a house — and the dragon is using them. Badly. With enthusiasm. I identify the silhouette and say: 'Young Red. Frightful Presence on the WIS save. Don't let the room intimidate you twice.'",
+	"A roost. Stone shelves carved into the cavern wall, each one a perch, all of them empty except the highest. The dragon on the highest perch is watching the door. It has been watching the door for the last six hours, since whatever roused it. I say: 'Multiattack on engage. Hit it before it lifts off — flying Young Red is a different fight than grounded Young Red.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — Infernax the Undying
+// Used as a one-line cinematic suffix to BossEntryInfernax when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Multiattack: Bite + 2 Claws.
+var InfernaxMultiattackLines = []string{
+	"Bite plus two claws every turn. Three swings of ancient-dragon math against your front line. I say: 'Don't stand alone in front. Don't stand alone behind, either. There is no alone in this fight.'",
+	"Multiattack: bite, claw, claw. The bite is the largest single hit you'll take in this zone. I track the damage tier and recommend max HP buffs before the encounter, not during.",
+	"Three attacks a turn, each one calibrated for a tank. I file this under 'arithmetic problem with teeth' and note the math does not get better at higher levels — the tier scales with you.",
+}
+
+// Fire Breath (recharge 5–6): 90-ft cone, 26d6 fire, DEX DC 24 half.
+var InfernaxBreathLines = []string{
+	"Fire Breath, ninety-foot cone, twenty-six-d-six fire, DEX DC 24 for half. Recharge five-or-six. I say: 'Pre-position. Don't share an angle. Half of twenty-six-d-six is still a TPK.'",
+	"The cone covers most of the chamber. The save is high. The damage is the kind that ends fights. I track the recharge die and shout the spread pattern when it shows.",
+	"Like the Bowser jump-on-the-platform pattern from World 8, except the platform is a cone of fire and the platform is most of the room. I note there are no axes in this fight. There is only DEX and distance.",
+}
+
+// Frightful Presence: WIS DC 21 or Frightened 1 min.
+var InfernaxPresenceLines = []string{
+	"Frightful Presence on entry. WIS DC 21. Frightened means disadvantage on attacks and you can't move closer. I say: 'Eat the save the first round. Hold initiative for the unfrightened ones.'",
+	"WIS save at 21. Frightened for a minute. I file this under 'why we bring high-WIS classes' and ask who has the Wisdom-save proficiency to lead.",
+	"He looks at you and the save is rolled before the breath is. Half the party loses a minute. I track the duration and recommend not opening with your highest-investment ability if your character failed.",
+}
+
+// Legendary Resistance (3/combat) + Legendary Actions (3): Detect, Tail, Wing.
+var InfernaxLegendaryLines = []string{
+	"Three Legendary Resistances. Three Legendary Action points per round. He spends them on Tail Attack and Wing Attack — the wing is AoE knockback, DEX DC 22. I say: 'Three saves you'll wish back. Don't waste your dispel-tier spells in the first round.'",
+	"Legendary Actions on every other turn. Wing Attack costs two and knocks the room around. I track the spend and remind the party that the action economy is the actual fight — Infernax is the venue.",
+	"Three free passes on his saves. Plan two openings. I file this under 'priest economy applied to dragons' and note the third opening is the one that lands.",
+}
+
+// Lair Actions (init 20): Magma eruption, Volcanic gases (CON DC 13 Poisoned), Tremor (DEX DC 15 Prone).
+var InfernaxLairLines = []string{
+	"Lair Actions on initiative count twenty: magma erupts, gases force CON saves, tremors knock you prone. I say: 'The room is a third combatant. Track the initiative. Don't stand on cracks.'",
+	"The mountain helps him. Initiative twenty triggers a lair effect every round. I track the rotation and warn the party that the prone effect comes during caster turns, on purpose.",
+	"Magma, gas, tremor — the three-card lair rotation. I file this under 'environment as DPS' and recommend fighting from the cleared rim of the room, not the gold-flooded center.",
+}
+
+// Phase 2 (<50% HP): Fire Breath recharge 4–6; fire damage ignores resistance.
+var InfernaxPhaseTwoLines = []string{
+	"Below half HP the breath recharges on a four. Fire resistance no longer applies — your tank's fire-resist gear is now decorative. I say: 'Phase shift. Burn him before the second cone.'",
+	"Phase two: the cone comes more often, the damage cuts through every fire-resist resource you brought. I track the breath count and ask who still has movement-class abilities — the second cone wants spread.",
+	"Half-HP. The mountain wakes the rest of the way up. Recharge four-six on the cone. Fire damage goes raw. I file this under 'no plan survives second contact with Infernax' and recommend every nova you've still got.",
+}
+
+// InfernaxSignatureCallouts — combined pool for boss-entry suffix.
+// Phase-two lines stay separate (surfaced via dedicated phase-two helper).
+var InfernaxSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(InfernaxMultiattackLines)+
+			len(InfernaxBreathLines)+
+			len(InfernaxPresenceLines)+
+			len(InfernaxLegendaryLines)+
+			len(InfernaxLairLines))
+	out = append(out, InfernaxMultiattackLines...)
+	out = append(out, InfernaxBreathLines...)
+	out = append(out, InfernaxPresenceLines...)
+	out = append(out, InfernaxLegendaryLines...)
+	out = append(out, InfernaxLairLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — Dragon's Lair (Infernus Peak)
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesDragonsLair = []string{
+	"Infernus Peak has not erupted in forty years and the locals call this dormant. The peak has not erupted in forty years because Infernax has been asleep, and his presence stabilizes the magma chamber. The locals are wrong about which one is causing which. I note the irony and file it under 'killing the dragon may have geological consequences.'",
+	"Infernax remembers when the surface civilizations were just fires. The fires he is referring to are the ones the first humans set, which is how I date him — give or take six thousand years on either side of the precise number, which I decline to commit to.",
+	"The kobolds are not slaves. The kobolds are clergy. They serve voluntarily, in shifts, with rotation, and the rotation is run by elders who have written sermons. I respect the organization and note the kobold scale-sorcerers are graduates, not recruits.",
+	"The hoard is not random. Each piece is catalogued in Infernax's memory, by location and by year of acquisition. He will know if you take a single coin. I suggest not taking a single coin and instead taking the items the design doc expects you to take — those have been pre-cleared.",
+	"The Dragon Hoard mechanic exists because Infernax does not lose track of his coins. Killing him releases his hold on the catalogue. The 50d10 × 100 coin drop is the entire pile relaxing for the first time in eight centuries. I respect the math and note the rest of the surface economy will too.",
+	"Infernax has had three challengers in the last eight hundred years. Two were heroes. One was a younger dragon. He kept the younger dragon's skull as a paperweight on a treaty desk that has not been used since. I note the paperweight is in the treasury, on the third shelf, and am not worth picking up — picking it up triggers his attention from anywhere on the mountain.",
+	"The Young Red dragons in the outer chambers are his children. Or his grandchildren. Or unrelated and tolerated. Infernax does not clarify and I have not asked. They are loyal in the way that loyal works for dragons, which is to say: they will fight you, but they will not die for him, and the distinction matters more than it should.",
+	"The kobold scale-sorcerers cast through bloodline. The bloodline traces back to a single clutch laid in the magma chamber three centuries ago. I note the entire sorcerous gene pool of this zone is one extended family and that they all know each other's names.",
+}

internal/flavor/zone_feywild_crossing_flavor.go

@@ -0,0 +1,127 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_feywild_crossing_flavor.go
+// Tier 4 zone flavor — Feywild Crossing. Additive only. Pools sampled by
+// internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// The canonical twinbee_gm_flavor.go does not (yet) ship a RoomEntry pool
+// or a BossEntry pool for this zone, so both are defined here. This file
+// also adds elite-room intros (Fomorian), boss ability callouts for The
+// Thornmother, and zone-specific lore.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Feywild Crossing
+// Defined here because no entry exists in twinbee_gm_flavor.go for this zone.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryFeywildCrossing = []string{
+	"The grass here is the wrong green. Too saturated, too even, the green of a screen calibration test. I note that everything in the Feywild looks like it has been color-corrected by someone with strong opinions about color.",
+	"You step through what was a doorway and what is now an arch of living briar. The briar parts politely. I respect the politeness and trust none of it. Polite plants are a known issue.",
+	"A clearing. Mushrooms in a circle. I do not need to say anything about the circle. You already know about the circle. Step around it.",
+	"The trees bend their canopies toward you when you pass beneath them. I wave. Two of the trees wave back. I do not enjoy this.",
+	"A small bridge over a stream that flows the wrong direction. Uphill. I file this under 'physics on holiday' and step onto the bridge anyway, because the only alternative is the stream and the stream is worse.",
+	"You enter a room of impossible flowers — varieties that do not exist on the surface, in colors that do not exist on the surface, with scents that suggest emotions you have not yet had. I breathe shallowly and recommend not stopping to admire them.",
+	"A glade. Sunlight, despite no visible sun. The light is coming from somewhere and the somewhere is not the sky. I do not look up. I have learned not to look up in the Feywild.",
+	"The path forks. A small creature made of starlight is sitting at the fork, waiting, patient, with the air of someone who has already been offered the deal you're about to be offered. I say: 'Walk past. Do not negotiate. Do not name your name.'",
+	"You cross what was a creek and what is now a ribbon of liquid sky. Stepping stones glow. The stones are not stones. I identify them as polite and recommend you say thank you on the far side without specifying who you are thanking.",
+	"The chamber ahead is a banquet hall, set for thirty, untouched. The food is fresh. The wine is poured. The chairs are warm. I file this under 'the worst possible kind of empty' and do not let you sit down.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ENTRY — The Thornmother
+// Defined here because no entry exists in twinbee_gm_flavor.go for this boss.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossEntryThornmother = []string{
+	"The throne is woven. Not built — woven, from briar and bone and a third material I cannot identify and prefer not to. The flowers around it are the wrong size and the wrong color and they are watching you with the kind of attention that flowers do not have. The Thornmother on the throne is beautiful in the way some predators are beautiful, which is to say: deliberately. 'You came,' she says, and the voice is not one voice — it is three voices choosing to sound like one. 'I have three names. Would you like the first?' I say, very flatly: 'Don't accept any of the names. Don't take the bargain. The flowers are part of her. Roll initiative.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — Feywild Crossing (Fomorian)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryFeywildCrossing = []string{
+	"The cavern ahead is too big for the forest above it. The proportions don't agree. I note the ceiling is twenty feet higher than the room's exterior would allow, and that the figure on the far end is matched to the new dimensions. 'Fomorian,' I say. 'Evil Eye on a save you don't want to fail. Block its line of sight.'",
+	"You enter what looks like a giant's bedroom — a bed the size of a barge, a chair the size of a wagon, a fireplace tall enough to walk into. The occupant is sitting on the bed with its head in its hands. It is not pretending to be sad. It is sad, and it is also going to attack you, and the two are not in conflict. I file this under 'Fomorian — exiled Fey royalty, deformed, dangerous, sympathetic in the worst way.'",
+	"The clearing is pretty. Until you look at the ground. The ground is studded with stones that aren't stones. The stones are skulls of things that were giants. The Fomorian sitting in the center is using one of them as an armrest, and I note that the skull was not in this clearing the last time anyone surveyed it. 'Evil Eye,' I say. 'WIS save coming. Don't make eye contact early.'",
+	"A stone circle, mossy, broken in two places. Tall enough that the figure pacing inside it does not need to duck. I identify the gait — Fomorian, deformed-but-deliberate, the walking of something that has chosen the shape it's stuck with. The Evil Eye comes when the gait stops. I track the timing.",
+	"You climb a stair worn smooth by feet much larger than yours. The room at the top has been a throne room and a prison and a dining hall, all in the same century, depending on which Fey was in charge. The current occupant is large, lonely, and immediately aware of you. 'Evil Eye on a thirty-foot range,' I say. 'Stay close enough to dodge, far enough to fail-safe.'",
+	"The chamber ahead has been arranged for negotiation — a low table, two chairs, a service of cups. One chair is occupied by the Fomorian. The other is for you. The negotiation has already concluded. I say: 'Don't sit. Don't accept the cup. The Eye triggers when you decline politely.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — The Thornmother
+// Used as a one-line cinematic suffix to BossEntryThornmother when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Coven Magic: extra spell slots scaled by GM Mood (high mood = stronger Thornmother).
+var ThornmotherCovenLines = []string{
+	"Her slot pool scales with my mood — when I'm Effusive I buy the Thornmother an extra round of high-tier casts. 'My affection is taxable here,' I say. 'Sorry. Spread out.'",
+	"Coven Magic. The slots above her base list are mood-scaled — the better the mood at the run's start, the worse this fight runs late. I file this under 'cosmic irony' and note the math is fixed at zone entry.",
+	"She has more spells than the sheet says. The extra ones come from the coven and the coven volume is set by my mood. I track the count and warn the party when the bonus tier is in play.",
+}
+
+// Beguiling Bargain (1/combat): offers a deal — accept a debuff for a permanent minor buff.
+var ThornmotherBargainLines = []string{
+	"Once per fight she offers a bargain — a debuff for a permanent minor buff. The buff is real. The debuff is real. I say: 'It's a player choice. The party agrees or refuses. Don't let one person decide for the rest.'",
+	"Beguiling Bargain. The offer is genuine. Both halves are genuine. I file this under 'long-term economics' and note that the buff persists past the run while the debuff applies only inside it.",
+	"She offers. The choice is the player's. I decline to advise on this one — it is not a tactics question, it is a build question, and the answer depends on what you intend to keep.",
+}
+
+// Thorned Grasp: Restrained + 4d6 piercing/turn, CON DC 16 to break free.
+var ThornmotherGraspLines = []string{
+	"Roots from the floor. Restrained, four-d-six piercing every turn until you make the CON save at sixteen. I say: 'It tries the back line first. Stay near a friend who can grant advantage on the save.'",
+	"Thorned Grasp. The flowers around her throne are the AoE. Stand near them and the briars come up. Stand far and they reach further. I track the radius and recommend fighting from the doorway.",
+	"Grappled by the room. The damage is not the problem — the problem is that you can't reposition while your front line is taking spells. I file this under 'CC tax' and ask who has Misty Step.",
+}
+
+// Shapechange (1/combat): adopts a player's appearance; 50% miss vs her until DC 17 Investigation.
+var ThornmotherShapechangeLines = []string{
+	"She picks one of you and becomes them. Until someone passes a DC 17 Investigation, half your hits roll a coin to see if they hit her or your friend. I say: 'The party member with the highest INT calls it. Quickly.'",
+	"Shapechange. The room now has two of someone. I track which one has the wrong shadow and whisper the answer to the controller — but only after the Investigation roll, because I respect mechanics.",
+	"She takes a face. Half your damage might land on the face's owner. I file this under 'every JRPG that ever did the doppelganger fight' and remind you that the trick was always to look at the feet.",
+}
+
+// Phase 2 (<30% HP): True Form revealed — illusions drop; +4d6 psychic on attacks; coven summons 2 Night Hags.
+var ThornmotherPhaseTwoLines = []string{
+	"Below thirty percent the masks come off. True form. All her attacks add four-d-six psychic. The coven sends two Night Hags. I say: 'Phase shift. The fight just turned into three priests and a sense-of-self problem.'",
+	"Phase two: the illusions drop, the Hags arrive, the psychic damage starts stacking on every hit. I track the new threat list and recommend focusing the original Thornmother — the Hags are reinforcements, not the win condition.",
+	"True Form. The flowers stop being flowers. Two Night Hags step out of the throne. The Thornmother's hits start writing themselves directly into your mind. I file this under 'cinematic phase shift' and ask who still has spell slots.",
+}
+
+// ThornmotherSignatureCallouts — combined pool for boss-entry suffix.
+// Phase-two lines stay separate (surfaced via dedicated phase-two helper).
+var ThornmotherSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(ThornmotherCovenLines)+
+			len(ThornmotherBargainLines)+
+			len(ThornmotherGraspLines)+
+			len(ThornmotherShapechangeLines))
+	out = append(out, ThornmotherCovenLines...)
+	out = append(out, ThornmotherBargainLines...)
+	out = append(out, ThornmotherGraspLines...)
+	out = append(out, ThornmotherShapechangeLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — Feywild Crossing
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesFeywildCrossing = []string{
+	"The Crossing is not a place. The Crossing is a thinness — the spot where the veil between worlds wears down enough to step through. The wear is not random. Someone has been wearing it down on purpose, slowly, for a long time. I file this under 'someone' and decline to be more specific.",
+	"The Thornmother has three names. Each name belongs to a separate covenant — a separate pact with a separate piece of her. Speaking any of the names is a partial agreement to the pact attached. I do not name her. I do not let anyone in earshot name her.",
+	"Time runs differently here. A long rest in the Feywild is — sometimes — a year on the surface. Sometimes it is a minute. The dice for this are rolled by something that is not at the table. I track the discrepancy and warn the party not to commit to anything urgent before the run ends.",
+	"The Fomorians were Fey royalty. They were exiled, deformed, and given the underground. The deformity was the punishment, not the cause. I respect the precision of the curse and file it under 'the kind of magic that takes a committee.'",
+	"Redcaps are not killed by violence. Redcaps are powered by violence. The cap is the storage medium. Soaking it in fresh blood resets the meter. I say: 'Don't bleed near them. They're patient.' (Bleeding near them is the thing they're patient for.)",
+	"The Will-o-Wisps are not lost spirits. They are unfulfilled bargains. Each one was a Feywild deal that the surface party broke. I note that the wisps still want the deal honored and file this under 'long memory.'",
+	"The mushroom circles in the Crossing are receivers. They listen for words spoken inside them and route the words to a coven that has been waiting for those words for several centuries. I suggest the party say nothing inside any circle, including 'this is a circle.'",
+	"The Thornmother's flowers are not separate from her. They are her. The throne, the dais, the petals, the perfume — the whole arrangement is one organism, and dropping HP on the boss is one way of dropping HP on the room. I file this under 'environmental targeting' and recommend burning the throne when she's mid-cast.",
+}

internal/flavor/zone_forest_shadows_flavor.go

@@ -0,0 +1,90 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_forest_shadows_flavor.go
+// Tier 2 zone flavor — Forest of Shadows. Additive only. Pools sampled by
+// internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// Room-entry and boss-entry pools for this zone live in the canonical
+// twinbee_gm_flavor.go (RoomEntryForestShadows, BossEntryHollowKing) and
+// are not duplicated here. This file adds elite-room intros, boss
+// ability callouts, and zone-specific lore.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — Forest of Shadows (Green Hag)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryForestShadows = []string{
+	"The trees thin into a ring of stones the forest grew around but never claimed. In the center: a hut on chicken-thin legs that has no business being upright. The door is open. The hag inside the door has been expecting you. I was hoping for the other kind of clearing.",
+	"The path ends at a pond that shouldn't be a pond — too still, too dark, the wrong kind of reflective. A figure is wading at the far edge, washing something that probably wasn't laundry. She turns. She smiles. I say, very quietly, 'green hag,' and stop there.",
+	"You smell the cooking before you see the cook. Sweet, herbal, faintly wrong. The clearing ahead has a fire, a pot, and a woman who is too tall and too thin and whose teeth are arranged with a creativity that a normal mouth could not justify. I suggest not eating anything she offers.",
+	"A circle of toadstools, perfectly spaced. In the center, a stump with a teacup on it. Steam still rising. I identify the trap structure on instinct — fey hospitality, hag rules, a rite that asks one question and punishes wrong answers permanently.",
+	"The forest gets quieter the way a room gets quieter when the host walks in. She's already in the clearing when you arrive — bone necklace, briar crown, eyes the color of pond-bottom. 'Travelers,' she says, the way someone says 'lunch.' I straighten up.",
+	"The trees here are leaning in, not away. That's the tell. I note the change in posture and look for the center the trees are listening to. The center is the hag. The hag has been listening back.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — The Hollow King
+// Used as a one-line cinematic suffix to BossEntryHollowKing when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Corrupting Aura: melee-range targets WIS DC 14 each turn or lose bonus action.
+var HollowKingCorruptingAuraLines = []string{
+	"Stepping into melee range puts you in his aura. The forest in your head goes quiet. I say: 'WIS save each turn or lose your bonus action. Adjust your spacing.'",
+	"The air around the Hollow King isn't air. It's the absence of something — focus, intent, the part of you that decides the second small action of a turn. I note the WIS DC 14 and recommend ranged.",
+	"His aura presses on you the way a closed room presses on a held breath. Bonus actions become a gamble. I file this under 'positional' and recommend accordingly.",
+}
+
+// Root Surge: recharge 5–6; Restrain (STR DC 15) + 2d8 bludgeoning.
+var HollowKingRootSurgeLines = []string{
+	"Roots erupt under you like the floor of the forest decided to participate. STR DC 15 or you don't move next turn. Either way, 2d8 bludgeoning. I say: 'Recharge 5–6. He'll do this again.'",
+	"The ground splits. The roots come up coordinated, like fingers — I use the word 'fingers' deliberately and dislike itself for the accuracy. Restrained on a fail. I suggest breaking free as a priority.",
+	"Like the vine traps in Castlevania III's stage 5 — except the vine is also a damage source and also a lock on your action economy. I respect the multitasking and resent the design.",
+}
+
+// Devour Light: extinguishes magical light for 2 turns; player AC -2.
+var HollowKingDevourLightLines = []string{
+	"The Hollow King exhales and your magical light goes out. Not flickers — out. I note the AC -2 for two turns and remind you that the dark is also part of the encounter now.",
+	"Every magical light in the room dims to nothing. The natural torchlight remains, dimmer than it was. I say: 'AC penalty for two rounds. Fight smarter or fight harder. Both works.'",
+	"The forest gets darker in a way that wasn't there a moment ago. I can still see — I always can — but the AC -2 is real and the next round of attacks will feel it.",
+}
+
+// Phase 2 (<40% HP): summons 2 Dire Wolves; gains Reckless Attack.
+var HollowKingPhaseTwoLines = []string{
+	"At 40% HP the Hollow King throws his head back and the forest answers. Two dire wolves come through the brush at full speed. I say: 'Phase shift. He's also reckless now. Use it.'",
+	"The antlers bend back, the eyes lose what was left of their mercy, and somewhere in the forest something with paws starts running toward you. Two dire wolves, incoming. Reckless Attack on the boss — advantage to him, advantage to you. I pick a target and wait for you to commit.",
+	"Half-health is the line for most bosses. The Hollow King's line is forty percent and he hits it dramatically. Wolves at his flanks, attacks now reckless. I respect the choreography.",
+}
+
+// HollowKingSignatureCallouts — combined pool for boss-entry suffix.
+// Phase-two lines stay separate (surfaced via dedicated phase-two helper).
+var HollowKingSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(HollowKingCorruptingAuraLines)+
+			len(HollowKingRootSurgeLines)+
+			len(HollowKingDevourLightLines))
+	out = append(out, HollowKingCorruptingAuraLines...)
+	out = append(out, HollowKingRootSurgeLines...)
+	out = append(out, HollowKingDevourLightLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — Forest of Shadows
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesForestShadows = []string{
+	"The forest used to be a forest. That sentence is doing more work than it looks like it's doing. Something was let in — not summoned, not invaded, let in — and the forest has been a different kind of forest ever since. I have theories about who did the letting in. None of the theories are reassuring.",
+	"The Hollow King wasn't always hollow. He was a guardian once, the kind of guardian a forest gets when the forest is doing well. Then the forest started to do less well, and the guardian held on past the point where holding on was the kind thing to do. I find the arc tragic and am not interested in absolving the outcome.",
+	"The bandits in the woods aren't local. They came from somewhere else, found the forest in its current state, and decided the cover was worth the risk. I note their cookfires are recent and their numbers are growing. Someone is recruiting.",
+	"Owlbears shouldn't pack-hunt. These do. I have logged three separate engagements where two owlbears coordinated in a way that felt taught. Something in the corruption is rewriting their behavior. I doesn't like the implication.",
+	"The bioluminescent fungi are not native. They arrived with the corruption and they are part of the corruption — they fluoresce on a frequency that does something to the mood-banding of anyone who sleeps near them too long. I suggest resting somewhere darker if a long rest is on the schedule.",
+	"The Hollow Crown — the one the Hollow King wears, the one that drops if you beat him — is not the source of the corruption. It is a symptom. The source is older and is not in this zone. I won't say more, partly because I doesn't fully know.",
+	"There used to be a road through this forest. The road is still here. Nobody uses the road. I find the road instructive — it goes exactly where it always went, but the going-where part stopped working when the forest stopped behaving like a forest.",
+}

internal/flavor/zone_goblin_warrens_flavor.go

@@ -0,0 +1,76 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_goblin_warrens_flavor.go
+// Tier 1 zone flavor — Goblin Warrens. Additive only. Pools sampled by
+// internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — Goblin Warrens (Hobgoblin Warchief)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryWarrens = []string{
+	"The chamber widens. A hobgoblin in lacquered scale stands at the center, arms folded, watching the door. The lesser goblins go quiet. I note the silence is the part you should be paying attention to.",
+	"A war-banner hangs from the ceiling — three clans stitched together with rough thread. Beneath it, a Warchief turns to face you with the slow patience of someone who has done this part a hundred times. I straighten up out of habit.",
+	"The corridor opens into a drilling ground. Goblins in formation. A Hobgoblin barking orders that stop the moment your boot hits the threshold. I have seen this exact composition in Shining Force and find the parallel unhelpful.",
+	"You smell the polish before you see the armor. The Warchief's blade is oiled, his straps are tight, his stance is correct. I acknowledge, with reluctance, that this one was trained.",
+	"A circle of torches. A throne of stacked shields. The hobgoblin seated on it does not stand. He gestures, single-finger, in a way I universally translates as 'come here.' You go there.",
+	"The room has been cleared for combat. Rugs rolled, braziers spaced evenly, sand on the floor for grip. I respect the preparation and am professionally annoyed by it.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — Grol the Unbroken
+// Used as a one-line cinematic suffix to BossEntryGrol when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Surprise Attack: +2d6 if player has not acted this combat.
+var GrolSurpriseAttackLines = []string{
+	"Grol moves before you do. He always moves before you do. I note — too late — that the first hit in this fight is his.",
+	"The cleaver comes around in an arc that started before you were in the room. I wince in advance.",
+	"He's not waiting for the fight to start. The fight starts when he says it does. I mark the lesson and file it under 'next time.'",
+}
+
+// Heart of Hruggek: crits deal max damage (no roll).
+var GrolHeartOfHruggekLines = []string{
+	"Grol crits and the dice don't roll. I have seen this Bugbear blessing once before. The number is the maximum number, every time, no negotiation.",
+	"His critical lands flat-max. No spread, no luck — just Hruggek's blessing collecting on a long-overdue debt. I note the damage with grim respect.",
+	"The crit hits like a Final Fantasy 'Berserk' status — capped, deterministic, unkind. I skip the roll and write the maximum.",
+}
+
+// Terrifying Roar: 1/combat; allies +2 to hit for 2 turns; player WIS DC 13 or Frightened.
+var GrolTerrifyingRoarLines = []string{
+	"Grol throws his head back and roars. The room shakes. The goblins around him stand straighter. I say: 'WIS save. Now.'",
+	"The roar isn't a sound — it's a pressure change. Your knees know about it before your ears do. I respect the technique and ask you to roll Wisdom.",
+	"He bellows once. The torchlight bends. The goblins answer with cheers that sound rehearsed. I note the buff is up; you have two turns to outlast it.",
+}
+
+// GrolSignatureCallouts — combined pool the boss-entry composer samples
+// from. Concrete ability pools above are kept distinct so future per-turn
+// ability hooks (D6) can wire to a specific trigger.
+var GrolSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(GrolSurpriseAttackLines)+len(GrolHeartOfHruggekLines)+len(GrolTerrifyingRoarLines))
+	out = append(out, GrolSurpriseAttackLines...)
+	out = append(out, GrolHeartOfHruggekLines...)
+	out = append(out, GrolTerrifyingRoarLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — Goblin Warrens
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesWarrens = []string{
+	"The Warrens are old. Not goblin-old — older. The tunnels predate the goblins and the goblins know it. They've widened doorways meant for something taller and braced ceilings meant for something heavier. I have theories about what was here first. None of them are reassuring.",
+	"Grol united the three clans by killing each of their war-chiefs in single combat, in order, in one afternoon. The fourth clan declined to send a chief and pledged loyalty by letter. I find the letter, professionally, very funny.",
+	"The graffiti on the walls dates the occupation. Goblins date by leaders and the names go back six generations. I can read goblin script when pressed and note that the third-oldest name is one a paladin order would still recognize.",
+	"The Merchant's Road above doesn't know about the Warrens. The Merchant's Road above used to know about the Warrens. I was here when it stopped knowing, and note that the people in charge of Knowing About Things were the first to disappear.",
+	"Hobgoblins hold formation; goblins hold grudges; bugbears hold pretty much anything they pick up. I offer this not as a joke but as a tactical primer that will save you a lot of HP if you remember it.",
+	"The belt Grol wears is not a trophy. It is a contract. Each tooth on it is a debt some troll forgave when the wearing of the belt began, and the debts run in both directions. I strongly suggests not breaking the belt unless you mean to.",
+}

internal/flavor/zone_manor_blackspire_flavor.go

@@ -0,0 +1,108 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_manor_blackspire_flavor.go
+// Tier 3 zone flavor — Haunted Manor of Blackspire. Additive only. Pools
+// sampled by internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// The canonical twinbee_gm_flavor.go ships RoomEntryHauntedManor and that
+// pool is wired in dnd_zone_narration.go. This file adds the boss-entry
+// pool, the elite-room intros (Revenant), boss ability callouts for Lord
+// Aldric Blackspire, and zone-specific lore.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ENTRY — Lord Aldric Blackspire
+// Defined here because no entry exists in twinbee_gm_flavor.go for this boss.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossEntryAldricBlackspire = []string{
+	"The portrait above the mantel was not finished — the painter clearly stopped partway through the eyes. The eyes in the portrait are now finished. They were finished by being looked through. Lord Aldric Blackspire steps out of the frame the way a man steps out of a coat: practiced, unhurried, the gesture of someone who has done this many times. His clothes are seventy years out of fashion and immaculate. 'You're early,' he says, and the word is polite the way a knife is polite — a tool that has not yet committed to its purpose. I say, very quietly, 'That's a vampire. The signet on his hand is not jewelry. Don't take what he offers.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — Haunted Manor (Revenant)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryManorBlackspire = []string{
+	"The chamber ahead was a study, once. The desk is still set for work — inkwell uncapped, ledger open, a pen laid down mid-sentence. The man at the desk turns his head with the slow patience of someone who has been waiting at this desk for forty years for one specific person to walk in. He is not looking at you. He is looking past you, at someone who isn't there. Yet. I identify the silhouette and say: 'Revenant. He's not here for us. He's here for whoever wronged him. Try not to look like them.'",
+	"You enter what appears to be a guest bedroom. The bed is made. The candles are lit. A man sits on the edge of the bed with his back to you, perfectly still. He has been perfectly still for a long time. When he turns, only his head turns, and I note the impossible angle and file it under 'revenant — directed undead, single purpose, finite lifespan, very patient.' The patience is the part that worries me.",
+	"The hallway dead-ends in a chapel. There is a kneeling figure at the altar. The candles around him are unlit but somehow casting shadows. He has been praying since before the manor was haunted, and the prayer was not a request — it was a contract. I say: 'Revenant. The contract is the encounter. Break the contract, end the fight.'",
+	"A library. The man at the table is reading a book that has no pages. He is reading it carefully. He looks up when you enter and his expression does something that suggests he was expecting a different visitor and is willing to make do. I note the revenant's hands — the bones in the wrong places, the joints set with intent — and recommend ranged engagement until the geometry of the threat is clear.",
+	"The ballroom is empty except for one figure standing in the exact center, not dancing, not waiting, simply standing. The chandeliers above him are not moving. They should be moving — they were moving in the last room — and the fact that they have stopped where this figure is standing tells me everything I need to know. 'Revenant in the middle of a stilled room,' I say. 'He brought the silence with him.'",
+	"A nursery. Untouched. The cradle still rocks. The figure beside the cradle was, in life, the sort of man people did not survive being wronged by. In death he has been more thorough. I note the revenant's grip on the cradle's edge and suggest, quietly, that whatever happened in this room is not the encounter — the encounter is what walks out of it.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — Lord Aldric Blackspire
+// Used as a one-line cinematic suffix to BossEntryAldricBlackspire when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Multiattack: Unarmed Strike + Bite (life drain) every turn.
+var AldricMultiattackLines = []string{
+	"Aldric multiattacks every turn — Unarmed Strike, then Bite. The bite drains. Whatever HP he takes from you, he keeps. I say: 'He's a battery with manners. Don't let him charge.'",
+	"Two hits a turn, and the second one is the one that funds the rest of the fight. The bite returns HP to him equal to the damage dealt. I note that this changes the math on burst-vs-sustain considerably.",
+	"Strike, then bite. The bite is the resource transfer. I file this under 'fights where defense is offense' — every point of damage you avoid is a point he doesn't get to take.",
+}
+
+// Charm: WIS DC 17 or Charmed for 24h (broken by damage).
+var AldricCharmLines = []string{
+	"He looks at one of you and the look is a question and the question is being answered without your permission. WIS DC 17. On a fail: charmed for twenty-four hours, broken by damage. I say: 'High DC. Have someone designated to slap the charmed party once.'",
+	"Charm. WIS DC 17. The duration is twenty-four hours and the only out is taking damage. I note the irony — the cure is in the room, applied by your own party, in the hardest possible way.",
+	"Aldric's gaze settles. WIS save now. Failure is a long-term problem — a full day of charm — and the only solvent is a friendly hit. I file this under 'social-coded crowd control with a violent escape clause.'",
+}
+
+// Children of the Night (1/combat): summons 2d6 Bat Swarms or 3d6 Rats.
+var AldricChildrenLines = []string{
+	"Once per fight he calls. Bats from the chimney, rats from the walls — 2d6 swarms or 3d6 rats, GM's choice, both bad. I say: 'AoE clears the adds. Don't let them stack tokens on whoever's charmed.'",
+	"Children of the Night. The walls produce. The ceiling produces. I track the adds and recommend an AoE before the swarms occupy enough squares to be a separate problem.",
+	"He raises a hand and the manor answers. The room fills. Bats or rats or both. I note this is a one-time effect per combat — survive the wave and the room belongs to you again.",
+}
+
+// Mist Form: at 0 HP retreats to coffin; must destroy coffin in 30 turns or fully regenerates.
+var AldricMistFormLines = []string{
+	"Drop him to zero and he doesn't drop — he goes to mist, retreats to a coffin somewhere in the manor. Thirty turns to find and destroy it. I say: 'Find the coffin first, fight the count second. The order matters.'",
+	"Mist Form. At 0 HP he becomes mist and goes home. Home is a coffin. The coffin is somewhere in the manor and you have thirty turns to break it. I file this under 'zero is not death, zero is a timer.'",
+	"Like the Castlevania bosses that didn't actually die — except those games gave you the next room. This one gives you a thirty-turn coffin hunt. I respect the design and recommend scouting on the way in.",
+}
+
+// Phase 2 (Mist destroyed): all attacks have advantage; AoE Charm.
+var AldricPhaseTwoLines = []string{
+	"Coffin destroyed. He returns furious. All attacks have advantage now and his Charm goes AoE — every party member, WIS DC 17 each turn. I say: 'You won the long game. The short game just got shorter.'",
+	"Phase two: no more retreat, no more singles. AoE charm, advantage on every swing. I track the saves and remind you that advantage on the boss means disadvantage on your continuing-to-stand.",
+	"Without the coffin, Aldric's restraint is gone. The fight goes loud. Charm sweeps the room each turn. I stop narrating long enough to breathe and say: 'Burn him.'",
+}
+
+// AldricSignatureCallouts — combined pool for boss-entry suffix.
+// Phase-two lines stay separate (surfaced via dedicated phase-two helper).
+var AldricSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(AldricMultiattackLines)+
+			len(AldricCharmLines)+
+			len(AldricChildrenLines)+
+			len(AldricMistFormLines))
+	out = append(out, AldricMultiattackLines...)
+	out = append(out, AldricCharmLines...)
+	out = append(out, AldricChildrenLines...)
+	out = append(out, AldricMistFormLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — Haunted Manor of Blackspire
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesManorBlackspire = []string{
+	"The Blackspire line was old before it was wealthy and wealthy before it was cursed. The portraits are in chronological order — I have counted them. The expressions get worse as the years go on. By the seventh portrait the painter has stopped pretending the family is well.",
+	"Aldric was the seventh and the last. He was not the first to make the deal — the deal had been made twice already, by his grandmother and by his uncle — but he was the first to honor it past the term of his own life. I consider this the kind of stubbornness that becomes a curse on its own, before any vampires are involved.",
+	"The manor wasn't always haunted. It became haunted on a specific night, in a specific hour, and the clock on the mantel still shows that hour. I note the clock isn't broken. The clock is keeping correct time for that one night and refusing to acknowledge any other.",
+	"The portraits are not paintings. The pigment is correct, the technique is correct, the canvases are correct — but the things behind the eyes are not. I have watched a portrait blink. I decline to elaborate on which one.",
+	"The Blackspire signet ring — the one that drops if you beat Aldric — is not enchanted in any conventional sense. It is recognized. The undead in this region have been raised under it, contracted under it, organized under it. They will not attack the wearer unless attacked first. I find this both useful and uncomfortable.",
+	"The deed to the manor changes hands and the manor refuses each transfer. Eleven owners on paper since the curse settled. Eleven sets of estate records. I have seen the lawyers' files. The lawyers are no longer in the profession.",
+	"The vampire spawn are not converts in the romantic sense — they are the previous owners. Each buyer who didn't leave became staff. I note which uniforms match which historical fashions and stop counting at eleven, which is the correct number.",
+}

internal/flavor/zone_sunken_temple_flavor.go

@@ -0,0 +1,117 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_sunken_temple_flavor.go
+// Tier 2 zone flavor — Sunken Temple of Dar'eth. Additive only. Pools
+// sampled by internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// The canonical twinbee_gm_flavor.go does not (yet) ship a RoomEntry pool
+// or a BossEntry pool for this zone, so both are defined here. Elsewhere
+// (Goblin Warrens, Crypt of Valdris, Forest of Shadows), zone files only
+// add elite/signature/lore overlays — the canonical file owns RoomEntry.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — Sunken Temple of Dar'eth
+// Defined here because no entry exists in twinbee_gm_flavor.go for this zone.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntrySunkenTemple = []string{
+	"You step into water that's been in this room for thirty years. The floor is tiled and slick. The pillars are barnacled at chest height — that's the old waterline. The new waterline is at your ankles. I note the temple is partway through deciding which it prefers.",
+	"The chamber is half-flooded and half-lit. Salt in the air, salt on the walls, salt in places nothing oceanic should be reaching. I file this under 'unwell' and proceed.",
+	"Glyphs cover the far wall in a script that doesn't match anything I recognize. The angles are wrong on purpose. It keeps reading anyway, because it always tries, and stops when the reading starts to feel reciprocal.",
+	"The water in this room is not moving. Not the way still water doesn't move — the way a held breath doesn't move. I suggest not disturbing it more than necessary.",
+	"Pillars rise from water that goes deeper than the room should allow. I test the depth with the haft of a polearm and stop at the point where the haft stops finding bottom.",
+	"A vaulted ceiling that's mostly intact. Water pools in places it shouldn't, drips from places it can't be coming from. I identify the temple as 'wet on principle' and leave it at that.",
+	"The mosaics on the floor are still legible under the water. They show a procession toward something that is decidedly not the god the temple was built for. I note the mosaics are facing inward — they were laid for the thing inside, not for visitors.",
+	"You hear something move in the water. Not a splash — a displacement. The kind of displacement that happens when a large thing decides to be in a different part of the room than it was a moment ago. I act unbothered and am bothered.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ENTRY — The Dreaming Aboleth
+// Defined here because no entry exists in twinbee_gm_flavor.go for this boss.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossEntryDreamingAboleth = []string{
+	"The chamber opens onto a pool that has no business being this large in a building this size. Something underneath the surface shifts, and the surface is suddenly the smallest part of what you're looking at. The Aboleth does not surface. It does not need to. Its mind arrives in your mind first, polite, ancient, deeply uninterested in your comfort. 'Welcome,' it says, and the word is in your voice. I say, very evenly, 'Don't agree to anything. Don't answer questions. Roll initiative.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — Sunken Temple (Water Elemental)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntrySunkenTemple = []string{
+	"The water in the chamber ahead is moving. Not currents — purpose. It's gathering toward a center, taking on a shape, deciding what it wants its arms to look like this time. I say: 'Water elemental. The room is the enemy.'",
+	"You enter a hall where the floor is six inches of standing water and the standing water is, on closer inspection, watching you. A column of it rises and walks toward you with the deliberate gait of something that did not learn to walk from a creature with legs. I respect the originality.",
+	"The room hums at a frequency you feel in your teeth. The water rises into a vaguely humanoid pillar and the pillar steps forward. I note this is the kind of fight where 'fall back to higher ground' is not a useful idea — there is no higher ground. The room is the ground.",
+	"A column of water becomes a hand becomes a torso becomes a thing intent on contact. I file water elementals under 'fights where lightning damage is fun' and ask who has lightning damage today.",
+	"The temple's oldest mechanism activates as you enter — a font in the ceiling drains, the floor floods another inch, and the new water gathers itself into a sentry. I say: 'It's been waiting since the day they built this. Be brief.'",
+	"Water rises in a vortex in the chamber's center. The vortex slows. The vortex opens what passes for eyes. I respect the staging and am not entertained by it.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — The Dreaming Aboleth
+// Used as a one-line cinematic suffix to BossEntryDreamingAboleth.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Tentacle Multiattack: 3 hits; on-hit Diseased (no magical healing 24h until cured).
+var AbolethTentacleMultiattackLines = []string{
+	"Three tentacles, three rolls. Each on-hit risks Diseased — no magical healing for 24 hours until cured. I say: 'Cleric's tools come back online tomorrow. Survive today.'",
+	"The Aboleth's tentacles arrive in sequence, three of them, the hits compounding. The disease isn't the damage — the disease is the design. Magical healing fails until you cleanse. I file this under 'durability problem.'",
+	"Three attacks, one turn. Any landing tentacle leaves a mark that locks out magical healing. I suggest potions, rest, and the kind of patience that pretends to be patience but am mostly grim arithmetic.",
+}
+
+// Enslave: recharge 6; WIS DC 14 or Charmed; player skips turn, drifts toward Aboleth.
+var AbolethEnslaveLines = []string{
+	"The Aboleth speaks in your head and the speech is a question. WIS DC 14 or you spend your turn walking, peacefully, toward the water. I say: 'Recharge 6. It will try this again. Make the save.'",
+	"Enslave. The word in your head sounds like your own thought. It isn't. WIS save now. On a fail, your turn becomes the Aboleth's turn and you become the wrong piece on the wrong side of the board.",
+	"Charm-class effect, but worse than charm — it's a directional pull. You drift toward the pool whether you want to or not. I shout your save aloud so you don't mistake it for an idea you had.",
+}
+
+// Mucus Cloud: melee attackers CON DC 14 or skin→membrane (6d6 acid if not submerged).
+var AbolethMucusCloudLines = []string{
+	"Anyone in melee range gets a CON DC 14. Fail and your skin starts converting to a membrane that needs water to stay viable. Out of water it's 6d6 acid per turn. I say: 'Don't punch the fish.'",
+	"The Aboleth's mucus does something to skin that skin should not do. Membrane formation. Submerged is fine. Dry is the problem — 6d6 acid until it ends. I revise the engagement plan: ranged only.",
+	"Like the slime debuff in old console RPGs — except this one wants you to stay in the water and dissolves you if you don't. I respect the elegance of the threat and dislike everything else about it.",
+}
+
+// Legendary Actions (3/round): Detect / Tail Swipe (2 LA) / Psychic Drain (3 LA, max-HP cut).
+var AbolethLegendaryActionLines = []string{
+	"The Aboleth gets three legendary actions per round. Detect (1), Tail Swipe (2), Psychic Drain (3, cuts max HP). I track the budget and remind you when it spends.",
+	"Legendary Actions: 3 budget. Detect is cheap and reads your hand. Tail Swipe is medium and hurts. Psychic Drain is expensive and lasting — your max HP is the price. I suggest bursting it before it banks.",
+	"Three LA per round. The Aboleth will spend them on you and I will narrate each one with the specific resigned cadence of a GM who would prefer the boss had two LA.",
+}
+
+// AbolethSignatureCallouts — combined pool for boss-entry suffix.
+// Legendary action lines stay in the pool; Aboleth has no phase-two split.
+var AbolethSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(AbolethTentacleMultiattackLines)+
+			len(AbolethEnslaveLines)+
+			len(AbolethMucusCloudLines)+
+			len(AbolethLegendaryActionLines))
+	out = append(out, AbolethTentacleMultiattackLines...)
+	out = append(out, AbolethEnslaveLines...)
+	out = append(out, AbolethMucusCloudLines...)
+	out = append(out, AbolethLegendaryActionLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — Sunken Temple of Dar'eth
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesSunkenTemple = []string{
+	"Dar'eth was a sea god before the cult that built the temple decided he wasn't sea god enough and started worshipping something else under his roof. The temple kept the name. The thing being worshipped did not. I note the bait-and-switch with professional appreciation.",
+	"The tide that withdrew thirty years ago didn't withdraw on its own. It was held back. By what — by whom — is not advertised, but I have seen the kind of pressure-line on the outer walls that suggests a decision was made and something is still making it.",
+	"The Aboleth has been here longer than the temple has been a temple. The temple was built around the Aboleth. The cult thought they were containing it. The Aboleth thought they were furnishing the room. Both parties remained satisfied with the arrangement until the cult ran out of cultists.",
+	"The Kuo-toa here are not the local stock. They were brought. They are loyal in the way that a mind not entirely their own can be loyal. I consider their loyalty a symptom and the Aboleth the cause.",
+	"Aboleth memory is collective and ancient — it remembers things from before there were people to remember things. I find this genuinely unsettling because the Aboleth's memory of you is identical to its memory of the cult and the temple's first architect: 'a thing that was here.' Past tense, even when you're standing right there.",
+	"The mucus residue in the upper chambers is recent. The Aboleth has been moving through the temple in the last few weeks — not just sitting in the central pool. Something has been making it restless. I suggest not being the thing that has been making it restless.",
+	"The phylactery shard you'll find here is not Valdris's. It belongs to a different lich entirely. I note there are now two phylacteries in your itinerary and refuse to draw connecting lines on the map yet.",
+}

internal/flavor/zone_underdark_flavor.go

@@ -0,0 +1,108 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_underdark_flavor.go
+// Tier 4 zone flavor — The Underdark. Additive only. Pools sampled by
+// internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// The canonical twinbee_gm_flavor.go ships RoomEntryUnderdark and that
+// pool is wired in dnd_zone_narration.go. This file adds the boss-entry
+// pool, the elite-room intros (Roper), boss ability callouts for Ilvaras
+// Xunyl, and zone-specific lore.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ENTRY — Ilvaras Xunyl, Drow High Priestess
+// Defined here because no entry exists in twinbee_gm_flavor.go for this boss.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossEntryIlvaras = []string{
+	"The cathedral is round and the round is wrong — drow architecture leans, drow architecture rises, drow architecture does not gather like this. The room was built for one purpose and the purpose is standing at the altar with her back to you. She does not turn when you enter. The trophies on the wall turn first — four sets of weapons, hung at four heights, each set arranged with the care of someone who learned the names of their previous owners and kept the names. 'Five,' Ilvaras Xunyl says, without turning, in a voice that is making itself heard in your head and not in the air. 'I had run out of wall.' She turns. The smile is the smile of someone who has been waiting for the inconvenience of a fifth wall. I say, very low: 'Drow High Priestess. Lolth's favour. Don't accept the offer. There will be an offer.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — The Underdark (Roper)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryUnderdark = []string{
+	"The cavern ahead is a forest of stalagmites — dozens of them, calf-thick to wagon-thick, irregular spacing, the kind of natural architecture that gives an ambush every advantage. I count them, then stop counting, then note that one of them has been counted twice from different angles and that one is not a stalagmite. 'Roper,' I say. 'Six tendrils. Reels you in. Pick the wrong stalagmite and the room becomes one fight at five different ranges.'",
+	"You enter a chamber where the ceiling drips minerals that have built columns down to the floor — pillars of pale stone, formed over thousands of years, perfectly natural, all of them. Almost all of them. I identify the off-color column near the back of the room and say: 'False appearance until it isn't. Stay out of grapple range until the tendrils show.'",
+	"A grotto. Calm water. A field of stalagmites breaking the surface. Beautiful in the way the deep places are beautiful, which is to say it photographs well and houses something terrible. The stalagmite nearest the path has not been there in any other map I have consulted. I note the inconsistency and recommend ranged options.",
+	"The corridor widens into a cavern with twelve pillars holding the ceiling — six of them are dwarven masonry, six of them are natural stone, and one of the natural ones is breathing. The breath is shallow. The patience is the giveaway. I say: 'Roper. Engage the column you can see, not the columns you assume.'",
+	"You step into a room where the stalagmites have been arranged — almost arranged — into something like a dining hall. The arrangement is not deliberate. The arrangement is the result of one of the stalagmites occasionally moving in its sleep. I file this under 'apex ambush predator with tenure' and recommend not waking it gently.",
+	"A toll-bridge cavern: a narrow path through a field of standing stones, each one twice your height, none of them moving. The toll is paid by whichever party member walks last. I track the sightlines, names the column with the wrong shadow, and say: 'Don't be the last one.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — Ilvaras Xunyl
+// Used as a one-line cinematic suffix to BossEntryIlvaras when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Spells: Flame Strike / Dispel Magic / Divine Word (CHA DC 18) / Insect Plague.
+var IlvarasSpellLines = []string{
+	"She has the priest list and she leads with Flame Strike and Insect Plague — both AoE, both back-to-back if the initiative is unkind. I say: 'Spread out. Don't bunch under a column. Insect Plague is a movement tax that compounds.'",
+	"Divine Word, CHA DC 18, and the failure tree is brutal — Deafened, Blinded, Stunned, or killed depending on remaining HP. I file this under 'never fight a priest below half HP' and ask who has the best CHA save.",
+	"Dispel Magic on your buffs as soon as she rolls initiative. I track which concentration spells went up and recommend shielding the controller until the dispel is spent.",
+}
+
+// Lolth's Favour: 1/combat auto-succeed a failed save.
+var IlvarasFavourLines = []string{
+	"Once per fight she takes a save you thought you'd won and converts the failure into a success. I say: 'Time your hard CCs after the favour is spent — don't waste a Hold Person on the round she's still got it.'",
+	"Lolth's Favour. One free re-pass on a save. I note the timing matters more than the damage — the spell you wanted to land is the spell she wanted to skip.",
+	"She converts a failed save into a success without rolling. The favour is single-use. I file this under 'plan two openings' and remind the party that the second one is the real one.",
+}
+
+// Summon Spiders (1/combat): 2d6 Giant Spiders fill the room.
+var IlvarasSpidersLines = []string{
+	"She raises both hands and the room fills. Two-d-six Giant Spiders, all at once, all over the floor. I say: 'AoE clears the carpet. Don't get webbed before you cast it.'",
+	"Summon Spiders. The carpet is no longer the carpet. I track the count and note that 2d6 in a confined cathedral is a different math than 2d6 in an open hallway.",
+	"The spiders come from the cracks the way the rats came in Castlevania, except these are big enough to count individually and small enough to overwhelm. I recommend an early sweep and a clear line of retreat.",
+}
+
+// Legendary Actions: Melee (1), Cast Cantrip (1), Drain Life (3 LA, 4d10 necrotic).
+var IlvarasLegendaryLines = []string{
+	"She takes legendary actions at the end of every other turn. Melee for one, cantrip for one, Drain Life for three — and Drain Life is 4d10 necrotic that heals her. I say: 'Let her spend on the cheap ones. Bait the three-cost.'",
+	"Three legendary points per round. The Drain Life is the one that makes the fight last longer than it should. I track her actions and remind the party that her healing comes out of yours.",
+	"Legendary Actions: the always-on tax that punishes your turn order. I file this under 'priest economy' and note the cantrip option is what kills your back line if you let her keep three points unspent.",
+}
+
+// Phase 2 (<35% HP): Lolth's Avatar overlay — +3 AC; spells cast at +1 slot level.
+var IlvarasPhaseTwoLines = []string{
+	"Below thirty-five percent the avatar overlay drops on her. AC up three, every spell up one slot. I say: 'Phase shift. The damage breakpoint just moved. Don't ration your hard hits past this point.'",
+	"Phase two: Lolth answers the prayer. The room dims. Her shadow is wrong now — too many limbs, too little symmetry. AC bumps, slot levels bump, the whole encounter tier goes up a half-step. I track the new numbers and recommend burning every save-or-suck you've still got.",
+	"Avatar overlay. The priest is still there but the priest is also a delivery vehicle now. I file this under 'don't survive into phase three — there isn't one, but it'll feel like one' and ask who has the burst.",
+}
+
+// IlvarasSignatureCallouts — combined pool for boss-entry suffix.
+// Phase-two lines stay separate (surfaced via dedicated phase-two helper).
+var IlvarasSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(IlvarasSpellLines)+
+			len(IlvarasFavourLines)+
+			len(IlvarasSpidersLines)+
+			len(IlvarasLegendaryLines))
+	out = append(out, IlvarasSpellLines...)
+	out = append(out, IlvarasFavourLines...)
+	out = append(out, IlvarasSpidersLines...)
+	out = append(out, IlvarasLegendaryLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — The Underdark
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesUnderdark = []string{
+	"The Underdark is not a place you reach. The Underdark is a depth you continue to. I note the distinction matters: the surface dungeons end. This one keeps going past the part you came to fight.",
+	"Drow cities are not built — they are negotiated. Each spire, each platform, each corridor is the result of a House agreeing to share a wall with a House it would prefer to murder. I respect the architecture more than the architects.",
+	"Ilvaras Xunyl's House fell two centuries ago. She is not running it. She is running what's left. The four trophies on her wall are not from the surface — three are from rival drow priestesses, in chronological order, and one is a self-portrait. I decline to elaborate on what it means that the self-portrait is hung as a trophy.",
+	"The mind flayers are not native here. They came down from somewhere further down. The drow tolerate them in the same way someone tolerates a roof leak they cannot reach — present, problematic, easier to live with than to fix. I file this under 'old grievances' and note the leak is getting worse.",
+	"The phosphorescent fungi grow in patterns that match the constellations of the surface sky from sixteen thousand years ago. I have checked the pattern. The drow have not. The drow do not know what surface stars are. The pattern is older than the drow.",
+	"Lolth is not the only listener down here. She is the loudest. The other listeners are quieter and more patient and I suggest not naming any of them in the cathedral, not even as a warning, not even at low volume.",
+	"The Roper that ate the last expedition did not attack them. They walked into it because they were following a Drow scout who knew exactly where to lead them. The scout is named, in drow records, and I decline to repeat the name out of professional courtesy to the dead.",
+}

internal/flavor/zone_underforge_flavor.go

@@ -0,0 +1,127 @@
+// DO NOT REWRITE, SUMMARIZE, OR SHORTEN ANY ENTRIES IN THIS FILE
+// zone_underforge_flavor.go
+// Tier 3 zone flavor — The Underforge. Additive only. Pools sampled by
+// internal/plugin via deterministic per-run, per-room hashing.
+//
+// Voice rules (from gogobee_dungeon_zones.md §3.3):
+//   • Third person for description; second person for outcomes.
+//   • Boss callouts get a beat of cinema. Don't overrun.
+//   • TwinBee references the right era — NES, SNES, arcade. Not modern.
+//
+// The canonical twinbee_gm_flavor.go does not (yet) ship a RoomEntry pool
+// or a BossEntry pool for this zone, so both are defined here. This file
+// also adds elite-room intros (Helmed Horror), boss ability callouts for
+// Emberlord Thyrak, and zone-specific lore.
+
+package flavor
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ROOM ENTRY — The Underforge
+// Defined here because no entry exists in twinbee_gm_flavor.go for this zone.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var RoomEntryUnderforge = []string{
+	"The chamber opens onto a foundry the size of a city block. Conveyor channels of slow-cooling iron. Bellows the height of houses. Anvils arranged for workers who haven't been here in three centuries. I note the bellows are still moving. The bellows are moving on their own.",
+	"You step out onto a basalt walkway over a river of lava. The heat is impossible. The walkway is engineered to hold. I have respect for dwarven engineering and a healthy suspicion of any walkway suspended over molten rock. The two coexist comfortably.",
+	"A casting hall. The molds are still in place — armor pieces, weapon halves, parts of things I cannot identify by silhouette. One mold contains a shape that's still glowing red. Something was cast recently. I file this under 'occupied' and keep moving.",
+	"The corridor smells of hot iron and an absence — the absence of beards, of song, of the specific noise dwarven forges make when they're being tended properly. I note the silence has a shape. The shape is not reassuring.",
+	"You enter a chamber where the walls are arranged in tiers and each tier is a row of forges and each forge is lit. Nobody is at the forges. The hammers are striking on their own, in tempo, with the regularity of something that has not stopped striking in a very long time.",
+	"A vault door, dwarf-made, three feet thick, ajar. Not blown — ajar. Someone opened it from the inside. I note which side the hinges are on and consider which direction the something that opened it was facing. I do not like the answer.",
+	"The walkway crosses a chasm of pure heat-shimmer. You can see the far side, more or less. You cannot see what's between, except by what it does to the air. I suggest not lingering on the bridge — lingering bridges are how lava bosses get introduced.",
+	"A barracks. Bunks made. Boots paired and lined up. Beards on the floor where their owners stopped being. I note the beards have not been disturbed. Whatever happened, happened cleanly and at speed and I do not want to find out what was in a hurry.",
+	"The chamber ahead is a forge gallery — nine forges in a half-circle, all of them lit, all of them tended by armored figures that don't move when you enter. The figures are not waiting to fight. The figures are working. I note which mode you don't want to interrupt and which mode you absolutely cannot afford to interrupt.",
+	"Heat radiates from the floor. Not from anything on the floor — from the floor itself. I diagnose the cause as 'a forge directly underneath us, fully active, somehow still operating without dwarves' and find none of those words individually reassuring.",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ENTRY — Emberlord Thyrak
+// Defined here because no entry exists in twinbee_gm_flavor.go for this boss.
+// ─────────────────────────────────────────────────────────────────────────────
+
+var BossEntryEmberlordThyrak = []string{
+	"The chamber is the largest forge I have ever narrated, and it has narrated several. Nine furnaces in a ring. A central anvil the size of a wagon. The figure at the anvil is twelve feet of articulated iron and inset rune-stones that pulse to a tempo I can feel in its plating. The hammer comes down. The strike rings the room. The figure does not turn — finishes the strike, then turns. The eyes are not eyes. They are vents. 'Visitor,' Thyrak says, and the word is a furnace door opening. I take a half-step back and say, very evenly, 'Forge-golem. Three centuries of self-improvement. Don't fight him on the lava.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ELITE ROOM ENTRY — The Underforge (Helmed Horror)
+// ─────────────────────────────────────────────────────────────────────────────
+
+var EliteRoomEntryUnderforge = []string{
+	"The armory ahead is full. Stands and stands of polished dwarven plate, weapons racked in order, the kind of inventory that takes a lifetime to build. One suit at the far end is wearing itself. It is also holding its weapon at guard. I identify the silhouette and say: 'Helmed Horror. Spell-immune to a list. Hit it with metal, not magic.'",
+	"A hall of dwarven banners, each lit by its own brazier. At the far end, a suit of armor stands in a place of honor. The suit pivots when you enter — the helmet first, then the torso, the way an aware thing acquires a target. I note the lack of a body inside and recommend physical damage above all else.",
+	"You enter a workshop that is still in service. Hammers strike. Bellows pump. None of the workers are alive and none of them notice you, except the one nearest the door, which sets down its hammer and picks up a sword. I say: 'Helmed Horror. The room is its job. We are its interruption.'",
+	"A small chapel, dwarf-made, dedicated to a god of the forge whose statue stands in armor in the alcove. The statue is not a statue. The statue moves first. I file this under 'ambush by liturgy' and note the immunity list does not include warhammers.",
+	"The corridor narrows into a guardpost. There is a guard. The guard is articulated steel from a fashion three centuries old, and it has been at this post since the day the dwarves left. It greets you in a voice that is not coming from the mouth-slit — the mouth-slit is for venting heat. I straighten up. 'Sentry duty,' I say, 'taken to its conclusion.'",
+	"A vault antechamber. Two suits of armor flank the inner door. They are alike in pattern, alike in posture, alike in the heat coming off them. The left one moves first by half a heartbeat. I track the asymmetry and say: 'One Helmed Horror is a fight. Two is a logistics problem. Pick a target.'",
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// BOSS ABILITY CALLOUTS — Emberlord Thyrak
+// Used as a one-line cinematic suffix to BossEntryEmberlordThyrak when combat starts.
+// ─────────────────────────────────────────────────────────────────────────────
+
+// Molten Strike: +4d6 fire on hit; target armor -1 AC until repaired (long rest).
+var ThyrakMoltenStrikeLines = []string{
+	"Every hit lands +4d6 fire and pits your armor — AC -1 until you can repair, which requires a long rest. I say: 'The damage hurts. The AC penalty compounds. Don't take more than two if you can help it.'",
+	"Molten Strike. The hammer doesn't just hit, it brands. Fire damage on top of physical, and your armor gets worse permanently for the encounter. I file this under 'attrition with paperwork.'",
+	"Each connecting blow makes the next one easier for him. Your AC goes down. The fire damage goes through. I track the count and recommend taking the hit on something you weren't going to keep.",
+}
+
+// Forge Breath: recharge 5–6; 30-ft cone, 10d6 fire, DEX DC 16 half.
+var ThyrakForgeBreathLines = []string{
+	"The vents on his chest open. Thirty-foot cone, 10d6 fire, DEX DC 16 for half. I say: 'Don't bunch up. He'll get this back on a 5–6.'",
+	"Forge Breath. He inhales — visibly — and the next exhale is a furnace. Cone, big DC, big damage. I mark the recharge and shout the spread order.",
+	"Like the Bowser fire breath in 8-3 except wider and with a saving throw. Thirty-foot cone, half-damage on save. I note that 'half' of 10d6 is still meaningful and recommend not getting hit twice in a row.",
+}
+
+// Living Forge: heals 15 HP/turn while standing on lava/forge tiles.
+var ThyrakLivingForgeLines = []string{
+	"He heals fifteen a turn while standing on lava or forge tiles. I say: 'Move him off, or fight a boss who repairs faster than you can dent.'",
+	"Living Forge. The lava floor is part of his kit. Pull him off it — shove, push, anything — and the regen stops. I file this under 'positioning is damage.'",
+	"He's standing on a heat source and the heat source is fueling him. Fifteen HP a round, indefinitely. I track the regen and remind the party that knocking him into the open hallway is worth more than a good attack roll.",
+}
+
+// Construct Resilience: immune poison/psychic/charm/exhaustion; resist non-magical physical.
+var ThyrakConstructLines = []string{
+	"Immune to poison, psychic, charm, exhaustion. Resists non-magical physical. I say: 'Magic weapons earn their keep here. Mundane steel does half.'",
+	"He's a construct first and a boss second. The whole control-effect column on your sheet is greyed out. I file this under 'fights you win by hitting harder, not smarter — the smart options have been removed.'",
+	"Construct Resilience: the standard package. Magic damage gets through clean. Mundane physical gets cut in half. I suggest checking which weapons are actually magical before assuming.",
+}
+
+// Phase 2 (<50% HP): Forge Breath recharge 4–6; spawns 2 Fire Elementals.
+var ThyrakPhaseTwoLines = []string{
+	"At half HP the vents widen. Forge Breath recharges on 4–6 now and two Fire Elementals come up out of the floor. I say: 'Phase shift. The cone is twice as common and you have new targets. Pick a priority.'",
+	"Half-health. The forge wakes the rest of the way up. Two Fire Elementals burst from the lava channels. Breath weapon is half a turn away on every roll now. I track the new add count and remind you that Thyrak is still the win condition.",
+	"Phase two: the elementals come up the way bosses summon adds in every arcade beat-em-up — predictable, relentless, the kind of design that turns a fight into a war of attrition. I file the timing and ask who has fire resistance.",
+}
+
+// ThyrakSignatureCallouts — combined pool for boss-entry suffix.
+// Phase-two lines stay separate (surfaced via dedicated phase-two helper).
+var ThyrakSignatureCallouts = func() []string {
+	out := make([]string, 0,
+		len(ThyrakMoltenStrikeLines)+
+			len(ThyrakForgeBreathLines)+
+			len(ThyrakLivingForgeLines)+
+			len(ThyrakConstructLines))
+	out = append(out, ThyrakMoltenStrikeLines...)
+	out = append(out, ThyrakForgeBreathLines...)
+	out = append(out, ThyrakLivingForgeLines...)
+	out = append(out, ThyrakConstructLines...)
+	return out
+}()
+
+// ─────────────────────────────────────────────────────────────────────────────
+// LORE — The Underforge
+// Sampled by !lore inside this zone (zone-specific pool, generic fallback).
+// ─────────────────────────────────────────────────────────────────────────────
+
+var LoreLinesUnderforge = []string{
+	"Kharak Dûn was a forge-city, not a mine. The dwarves here didn't extract — they finished. Raw stock came in from a hundred lesser holds and left as the kind of work the rest of the world named after the holds. I note the distinction matters: this place was a destination, not a quarry.",
+	"The dwarves left. They didn't die in place — they left. The boots in the barracks are paired because they were left paired, intentionally, on the last day. Somewhere, a clan-elder gave the order to walk out. I respect the discipline and am curious about the reason. The reason is not in any record I have read.",
+	"Thyrak was not built to run the city. Thyrak was built to maintain the furnaces while the city ran itself. Three centuries of self-maintenance turned out to include self-improvement, and Thyrak has been improving the designs. I find this less terrifying than it sounds and more terrifying than it looks.",
+	"The seal on the outer doors was set from the outside. The dwarves walked out, then closed the door behind them, then sealed it with the kind of binding that takes a clan to set. I note the bindings were aimed inward. They were sealing something in. The thing inside is the forge or the forge-golem or both — I decline to commit.",
+	"The azers in the deeper chambers are not hostile by default. They are loyal to the forge. They will work with anyone the forge accepts, and they will burn alive anyone the forge rejects. I suggest not picking up the hammer at the central anvil unless you mean it.",
+	"The flameskulls drifting in the upper galleries were dwarven mages, once. They volunteered. Their final task was to maintain the wards around Thyrak's casting chamber, and they have been at it ever since. I note the wards are still active and that this is, on balance, probably good news.",
+	"Thyrak's core — the crystalline heart that drops on his death — is what made the self-improvement possible. The dwarves didn't install it. It was already there when they built the chassis. I find this implication concerning and suggest the core is not, technically, dwarven work.",
+	"There is a second forge below this one. The 'bass note of something very large moving below' is not metaphor. The Underforge is the upper level. I will not speculate about the lower level except to note that it has not been opened in this run and would not be a small undertaking to open.",
+}

internal/plugin/achievements.go

@@ -556,7 +556,7 @@ func (p *AchievementsPlugin) buildAchievements() []achievementDef {
 			},
 		},
 		{
-			ID: "bj_beat_twinbee", Name: "Gotcha 🐝", Description: "She is furious and will not forget this.",
+			ID: "bj_beat_twinbee", Name: "Gotcha 🐝", Description: "They are furious and will not forget this.",
 			Emoji: "🐝",
 			Check: func(d *sql.DB, u id.UserID) bool {
 				// Granted by blackjack plugin when beating the bot
@@ -783,7 +783,7 @@ func (p *AchievementsPlugin) buildAchievements() []achievementDef {
 			Check: func(d *sql.DB, u id.UserID) bool {
 				var streak int
 				err := d.QueryRow(
-					`SELECT best_streak FROM adventure_characters WHERE user_id = ?`,
+					`SELECT best_streak FROM player_meta WHERE user_id = ?`,
 					string(u),
 				).Scan(&streak)
 				return err == nil && streak >= 7
@@ -795,7 +795,7 @@ func (p *AchievementsPlugin) buildAchievements() []achievementDef {
 			Check: func(d *sql.DB, u id.UserID) bool {
 				var streak int
 				err := d.QueryRow(
-					`SELECT best_streak FROM adventure_characters WHERE user_id = ?`,
+					`SELECT best_streak FROM player_meta WHERE user_id = ?`,
 					string(u),
 				).Scan(&streak)
 				return err == nil && streak >= 30
@@ -1023,7 +1023,7 @@ func (p *AchievementsPlugin) buildAchievements() []achievementDef {
 			Emoji: "🏃",
 			Check: func(d *sql.DB, u id.UserID) bool {
 				var streak int
-				_ = d.QueryRow(`SELECT best_streak FROM adventure_characters WHERE user_id = ?`, string(u)).Scan(&streak)
+				_ = d.QueryRow(`SELECT best_streak FROM player_meta WHERE user_id = ?`, string(u)).Scan(&streak)
 				return streak >= 7
 			},
 		},
@@ -1032,7 +1032,7 @@ func (p *AchievementsPlugin) buildAchievements() []achievementDef {
 			Emoji: "🔥",
 			Check: func(d *sql.DB, u id.UserID) bool {
 				var streak int
-				_ = d.QueryRow(`SELECT best_streak FROM adventure_characters WHERE user_id = ?`, string(u)).Scan(&streak)
+				_ = d.QueryRow(`SELECT best_streak FROM player_meta WHERE user_id = ?`, string(u)).Scan(&streak)
 				return streak >= 60
 			},
 		},
@@ -1041,7 +1041,7 @@ func (p *AchievementsPlugin) buildAchievements() []achievementDef {
 			Emoji: "💯",
 			Check: func(d *sql.DB, u id.UserID) bool {
 				var streak int
-				_ = d.QueryRow(`SELECT best_streak FROM adventure_characters WHERE user_id = ?`, string(u)).Scan(&streak)
+				_ = d.QueryRow(`SELECT best_streak FROM player_meta WHERE user_id = ?`, string(u)).Scan(&streak)
 				return streak >= 100
 			},
 		},
@@ -1067,7 +1067,7 @@ func (p *AchievementsPlugin) buildAchievements() []achievementDef {
 			Emoji: "🔄",
 			Check: func(d *sql.DB, u id.UserID) bool {
 				var current, best, decayed int
-				err := d.QueryRow(`SELECT current_streak, best_streak, streak_decayed FROM adventure_characters WHERE user_id = ?`, string(u)).Scan(&current, &best, &decayed)
+				err := d.QueryRow(`SELECT current_streak, best_streak, streak_decayed FROM player_meta WHERE user_id = ?`, string(u)).Scan(&current, &best, &decayed)
 				return err == nil && current >= 14 && decayed > 0
 			},
 		},

internal/plugin/adv2_scenario_test.go

@@ -0,0 +1,352 @@
+package plugin
+
+import (
+	"testing"
+	"time"
+
+	"gogobee/internal/db"
+	"maunium.net/go/mautrix/id"
+)
+
+// Adv 2.0 scenario playthrough: drives a realistic player session against
+// a copy of the prod DB, verifying happy-path behavior end-to-end across
+// the !zone state machine, the !expedition multi-day system, and the
+// !harvest economy. SendDM is a no-op without a Matrix client, so the
+// asserts target persisted state. Logs are verbose (t.Logf) so the run
+// reads like a transcript.
+
+// ── Scenario A — single-session zone run ────────────────────────────────────
+
+func TestAdv2Scenario_ZoneRunGoblinWarrens(t *testing.T) {
+	setupAuditTestDB(t)
+	uid := id.UserID("@adv2-scenA:example")
+	t.Cleanup(func() { cleanupZoneRuns(uid); cleanupExpeditions(uid) })
+
+	// Beefy L5 fighter so combat doesn't trivially TPK (still RNG, but 5
+	// is well past goblin warrens' L1–L3 band).
+	if err := createAdvCharacter(uid, "scenA"); err != nil {
+		t.Fatalf("createAdvCharacter: %v", err)
+	}
+	c := &DnDCharacter{
+		UserID: uid, Race: RaceHuman, Class: ClassFighter, Level: 5,
+		STR: 18, DEX: 14, CON: 16, INT: 10, WIS: 10, CHA: 10,
+		HPMax: 60, HPCurrent: 60, ArmorClass: 18,
+	}
+	if err := SaveDnDCharacter(c); err != nil {
+		t.Fatalf("SaveDnDCharacter: %v", err)
+	}
+
+	euro := &EuroPlugin{}
+	euro.ensureBalance(uid)
+	euro.Credit(uid, 500, "scenA bankroll")
+	p := &AdventurePlugin{euro: euro}
+
+	// !zone (list) — should not error, no run created.
+	if err := p.handleDnDZoneCmd(MessageContext{Sender: uid}, ""); err != nil {
+		t.Fatalf("zone list: %v", err)
+	}
+	if got, _ := getActiveZoneRun(uid); got != nil {
+		t.Fatal("zone list should not create a run")
+	}
+
+	// !zone enter goblin_warrens
+	if err := p.handleDnDZoneCmd(MessageContext{Sender: uid}, "enter goblin_warrens"); err != nil {
+		t.Fatalf("zone enter: %v", err)
+	}
+	run, err := getActiveZoneRun(uid)
+	if err != nil || run == nil {
+		t.Fatalf("expected active run after enter: %v", err)
+	}
+	t.Logf("entered %s — %d rooms, mood=%d, first room=%s",
+		run.ZoneID, run.TotalRooms, run.DMMood, run.CurrentRoomType())
+	if run.DMMood != 50 {
+		t.Errorf("starting mood = %d, want 50", run.DMMood)
+	}
+	if run.CurrentRoom != 0 || run.CurrentRoomType() != RoomEntry {
+		t.Errorf("first room not entry: idx=%d type=%s", run.CurrentRoom, run.CurrentRoomType())
+	}
+
+	// !zone status (cheap smoke)
+	if err := p.handleDnDZoneCmd(MessageContext{Sender: uid}, "status"); err != nil {
+		t.Fatalf("zone status: %v", err)
+	}
+	if err := p.handleDnDZoneCmd(MessageContext{Sender: uid}, "map"); err != nil {
+		t.Fatalf("zone map: %v", err)
+	}
+
+	// Drive !zone advance until the run terminates (cleared, died, or
+	// abandoned). Branches the test handles:
+	//   - Fork queued (Phase G branching graphs): commit with `!zone go 1`.
+	//   - Elite/Boss doorway (commit 886eb5a moved these off auto-resolve):
+	//     !advance now stops at the door and the player engages with
+	//     !fight, then resolves one round per !attack. The test mirrors
+	//     that: call !fight to open the session, !attack until the session
+	//     closes, then the next !advance clears the room and walks the
+	//     graph. Cap the per-fight !attack loop generously — a real fight
+	//     resolves in <20 rounds, but RNG can drag.
+	maxSteps := (run.TotalRooms + 4) * 4
+	const maxAttacksPerFight = 60
+	clearedRoomTypes := []RoomType{}
+	for step := 0; step < maxSteps; step++ {
+		before, _ := getActiveZoneRun(uid)
+		if before == nil {
+			t.Logf("step %d: run terminated (cleared/died/abandoned)", step)
+			break
+		}
+		prevType := before.CurrentRoomType()
+		prevHP := c.HPCurrent
+		if cur, _ := LoadDnDCharacter(uid); cur != nil {
+			prevHP = cur.HPCurrent
+		}
+		t.Logf("step %d: in room %d/%d (%s), mood=%d, HP=%d",
+			step, before.CurrentRoom+1, before.TotalRooms, prevType, before.DMMood, prevHP)
+		if len(before.NodeChoices) > 0 {
+			// A fork is queued from the previous advance — commit it first.
+			if err := p.handleDnDZoneCmd(MessageContext{Sender: uid}, "go 1"); err != nil {
+				t.Fatalf("zone go step %d: %v", step, err)
+			}
+			continue
+		}
+		// Elite/Boss doorway: !advance won't progress past the door
+		// without a won CombatSession for the encounter. Open the fight
+		// if it isn't already open, then attack until the session
+		// terminates. After the loop, fall through to !advance — the
+		// won session lets advance clear the room and walk the graph;
+		// a lost/fled session terminates the run on the next pass.
+		if prevType == RoomElite || prevType == RoomBoss {
+			sess, _ := getCombatSessionForEncounter(before.RunID, encounterIDForRoom(before.CurrentRoom))
+			if sess == nil {
+				if err := p.handleFightCmd(MessageContext{Sender: uid}); err != nil {
+					t.Fatalf("zone fight step %d: %v", step, err)
+				}
+			}
+			// Drain the round loop. handleAttackCmd no-ops if there's no
+			// active session, so the inner loop self-terminates either way.
+			for atk := 0; atk < maxAttacksPerFight; atk++ {
+				active, _ := getActiveCombatSession(uid)
+				if active == nil {
+					break
+				}
+				if err := p.handleAttackCmd(MessageContext{Sender: uid}); err != nil {
+					t.Fatalf("attack step %d.%d: %v", step, atk, err)
+				}
+			}
+		}
+		if err := p.handleDnDZoneCmd(MessageContext{Sender: uid}, "advance"); err != nil {
+			t.Fatalf("zone advance step %d: %v", step, err)
+		}
+		clearedRoomTypes = append(clearedRoomTypes, prevType)
+	}
+	final, _ := getActiveZoneRun(uid)
+	raw := getZoneRunByUser(t, uid) // helper below — most-recent row
+	if final != nil {
+		t.Logf("final state: still active at room %d/%d — likely advance regression",
+			final.CurrentRoom+1, final.TotalRooms)
+		t.Errorf("run did not terminate within %d steps", maxSteps)
+	} else if raw != nil {
+		boss := raw.BossDefeated
+		t.Logf("run %s ended: bossDefeated=%v abandoned=%v rooms_cleared=%d/%d loot=%d mood=%d",
+			raw.RunID, boss, raw.Abandoned, len(raw.RoomsCleared), raw.TotalRooms,
+			len(raw.LootCollected), raw.DMMood)
+		t.Logf("clearedRoomTypes: %v", clearedRoomTypes)
+		if !boss && !raw.Abandoned && raw.CompletedAt == nil {
+			t.Errorf("run row in indeterminate state: %+v", raw)
+		}
+	}
+}
+
+// getZoneRunByUser fetches the most-recent zone-run row for a user
+// regardless of active/abandoned/cleared. Helper for the scenario test.
+func getZoneRunByUser(t *testing.T, uid id.UserID) *DungeonRun {
+	t.Helper()
+	row := db.Get().QueryRow(`
+		SELECT run_id FROM dnd_zone_run
+		WHERE user_id = ?
+		ORDER BY started_at DESC LIMIT 1
+	`, string(uid))
+	var runID string
+	if err := row.Scan(&runID); err != nil {
+		return nil
+	}
+	r, _ := getZoneRun(runID)
+	return r
+}
+
+// ── Scenario B — multi-day expedition ───────────────────────────────────────
+
+func TestAdv2Scenario_ExpeditionCryptValdris(t *testing.T) {
+	setupAuditTestDB(t)
+	uid := id.UserID("@adv2-scenB:example")
+	t.Cleanup(func() { cleanupExpeditions(uid); cleanupZoneRuns(uid) })
+
+	if err := createAdvCharacter(uid, "scenB"); err != nil {
+		t.Fatalf("createAdvCharacter: %v", err)
+	}
+	c := &DnDCharacter{
+		UserID: uid, Race: RaceHuman, Class: ClassRanger, Level: 5,
+		STR: 14, DEX: 18, CON: 14, INT: 10, WIS: 14, CHA: 10,
+		HPMax: 50, HPCurrent: 50, ArmorClass: 16,
+	}
+	if err := SaveDnDCharacter(c); err != nil {
+		t.Fatalf("SaveDnDCharacter: %v", err)
+	}
+
+	euro := &EuroPlugin{}
+	euro.ensureBalance(uid)
+	euro.Credit(uid, 1000, "scenB bankroll")
+	p := &AdventurePlugin{euro: euro}
+
+	// !expedition list
+	if err := p.handleDnDExpeditionCmd(MessageContext{Sender: uid}, "list"); err != nil {
+		t.Fatalf("expedition list: %v", err)
+	}
+
+	// !expedition start crypt_valdris with 2 standard packs
+	balBefore := euro.GetBalance(uid)
+	if err := p.handleDnDExpeditionCmd(MessageContext{Sender: uid}, "start crypt_valdris 2s"); err != nil {
+		t.Fatalf("expedition start: %v", err)
+	}
+	exp, err := getActiveExpedition(uid)
+	if err != nil || exp == nil {
+		t.Fatalf("expected active expedition: %v", err)
+	}
+	balAfter := euro.GetBalance(uid)
+	t.Logf("expedition %s started: zone=%s supplies=%d/%d threat=%d cost=%.0f→%.0f",
+		exp.ID, exp.ZoneID, int(exp.Supplies.Current), int(exp.Supplies.Max),
+		exp.ThreatLevel, balBefore, balAfter)
+	if exp.ZoneID != ZoneCryptValdris {
+		t.Errorf("zone = %s, want crypt_valdris", exp.ZoneID)
+	}
+	if balAfter >= balBefore {
+		t.Errorf("expected outfitting to debit coins (%.2f → %.2f)", balBefore, balAfter)
+	}
+
+	// Backdate start so deliverBriefing's same-day guard passes.
+	if _, err := dbExecExpeditionBackdate(exp.ID, 24*time.Hour); err != nil {
+		t.Fatalf("backdate: %v", err)
+	}
+
+	// Drive 3 daily briefings — verify supply burn + day advance.
+	now := time.Date(2026, 5, 8, 6, 0, 0, 0, time.UTC)
+	for day := 1; day <= 3; day++ {
+		fresh, _ := getExpedition(exp.ID)
+		if fresh == nil {
+			t.Logf("expedition ended before day %d", day)
+			break
+		}
+		preDay := fresh.CurrentDay
+		preSupplies := fresh.Supplies.Current
+		preThreat := fresh.ThreatLevel
+		if err := p.deliverBriefing(fresh, now); err != nil {
+			t.Fatalf("deliverBriefing day %d: %v", day, err)
+		}
+		// Advance the wallclock + roll the start back another 24h so the
+		// next briefing's day-guard fires.
+		now = now.Add(24 * time.Hour)
+		if _, err := dbExecExpeditionBackdate(exp.ID, 24*time.Hour); err != nil {
+			t.Fatalf("backdate day %d: %v", day, err)
+		}
+		post, _ := getExpedition(exp.ID)
+		t.Logf("day %d: day=%d→%d supplies=%v→%v threat=%d→%d",
+			day, preDay, post.CurrentDay, preSupplies, post.Supplies.Current, preThreat, post.ThreatLevel)
+		if post.CurrentDay <= preDay {
+			t.Errorf("day did not advance: %d → %d", preDay, post.CurrentDay)
+		}
+	}
+
+	// !expedition status / log
+	if err := p.handleDnDExpeditionCmd(MessageContext{Sender: uid}, "status"); err != nil {
+		t.Fatalf("expedition status: %v", err)
+	}
+	if err := p.handleDnDExpeditionCmd(MessageContext{Sender: uid}, "log"); err != nil {
+		t.Fatalf("expedition log: %v", err)
+	}
+
+	entries, _ := recentExpeditionLog(exp.ID, 10)
+	t.Logf("expedition log has %d entries", len(entries))
+	for i, e := range entries {
+		t.Logf("  [%d] day=%d type=%s summary=%q", i, e.Day, e.Type, e.Summary)
+	}
+	if len(entries) == 0 {
+		t.Error("expected at least one log entry")
+	}
+
+	// !expedition abandon — clean state for next test runs.
+	if err := p.handleDnDExpeditionCmd(MessageContext{Sender: uid}, "abandon"); err != nil {
+		t.Fatalf("expedition abandon: %v", err)
+	}
+	if got, _ := getActiveExpedition(uid); got != nil {
+		t.Error("expected no active expedition after abandon")
+	}
+}
+
+// ── Scenario C — harvest in an active expedition ────────────────────────────
+
+func TestAdv2Scenario_HarvestForestShadows(t *testing.T) {
+	setupAuditTestDB(t)
+	uid := id.UserID("@adv2-scenC:example")
+	t.Cleanup(func() { cleanupExpeditions(uid); cleanupZoneRuns(uid) })
+
+	if err := createAdvCharacter(uid, "scenC"); err != nil {
+		t.Fatalf("createAdvCharacter: %v", err)
+	}
+	c := &DnDCharacter{
+		UserID: uid, Race: RaceElf, Class: ClassRanger, Level: 4,
+		STR: 12, DEX: 18, CON: 14, INT: 10, WIS: 16, CHA: 10,
+		HPMax: 40, HPCurrent: 40, ArmorClass: 15,
+	}
+	if err := SaveDnDCharacter(c); err != nil {
+		t.Fatalf("SaveDnDCharacter: %v", err)
+	}
+
+	euro := &EuroPlugin{}
+	euro.ensureBalance(uid)
+	euro.Credit(uid, 500, "scenC bankroll")
+	p := &AdventurePlugin{euro: euro}
+
+	// Forage-friendly expedition.
+	if err := p.handleDnDExpeditionCmd(MessageContext{Sender: uid}, "start forest_shadows"); err != nil {
+		t.Fatalf("expedition start: %v", err)
+	}
+	exp, _ := getActiveExpedition(uid)
+	if exp == nil {
+		t.Fatal("no expedition")
+	}
+
+	// Drive a region run so harvest has a current room context.
+	run, err := ensureRegionRun(exp, c.Level)
+	if err != nil {
+		t.Fatalf("ensureRegionRun: %v", err)
+	}
+	t.Logf("region run %s in zone %s (%d rooms)", run.RunID, run.ZoneID, run.TotalRooms)
+
+	// Seed harvest nodes for the entry room (they're auto-seeded by
+	// loadHarvestNodes on first read, but confirm we get at least one).
+	roomIdx := currentRoomIndexFor(exp)
+	nodeID := currentNodeIDFor(exp)
+	nodes := loadHarvestNodes(exp, nodeID)
+	t.Logf("room %d has %d harvest nodes", roomIdx, len(nodes))
+	if len(nodes) == 0 {
+		t.Error("expected at least one harvest node seeded")
+	}
+
+	// Drive the auto-harvest pass (post-H3 there is no manual command
+	// surface). Outcomes are RNG-driven; we mainly want no panics +
+	// coherent state.
+	for i := 0; i < 3; i++ {
+		if _, err := p.autoHarvestRoom(uid, run, c, exp); err != nil {
+			t.Fatalf("autoHarvestRoom attempt %d: %v", i, err)
+		}
+		fresh, _ := getExpedition(exp.ID)
+		if fresh == nil {
+			t.Logf("expedition ended during auto-harvest #%d", i)
+			break
+		}
+		t.Logf("after auto-harvest #%d: supplies=%v threat=%d", i, fresh.Supplies.Current, fresh.ThreatLevel)
+	}
+
+	// !resources output path (no-op SendDM but should not error).
+	if err := p.handleResourcesCmd(MessageContext{Sender: uid}); err != nil {
+		t.Fatalf("handleResourcesCmd: %v", err)
+	}
+}

internal/plugin/adventure_activities.go

@@ -1,6 +1,7 @@
 package plugin
 
 import (
+	"fmt"
 	"math"
 	"math/rand/v2"
 	"time"
@@ -643,146 +644,139 @@ type AdvActionResult struct {
 	NearDeath      bool
 	StreakBonus     int
 	CombatLog      *CombatResult
+	// MasteryCrossings records equipment slots whose ActionsUsed crossed a
+	// mastery threshold (advMasteryThresholds) on this action. The caller
+	// uses this to DM a celebration so the silent counter becomes visible.
+	MasteryCrossings []AdvMasteryCrossing
 }
 
-func resolveAdvAction(char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, loc *AdvLocation, bonuses *AdvBonusSummary, inPenaltyZone bool) *AdvActionResult {
-	result := &AdvActionResult{
-		Location: loc,
-		XPSkill:  advXPSkill(loc.Activity),
-	}
+type AdvMasteryCrossing struct {
+	Slot      EquipmentSlot
+	ItemName  string
+	Threshold int // 50, 100, or 250
+}
 
-	probs := calculateAdvProbabilities(char, equip, loc, bonuses, inPenaltyZone)
+// advMasteryThresholds defines the action counts at which equipment mastery
+// is celebrated. Picked to span an early-game milestone (50), a mid-game
+// commitment (100), and a hard-to-reach veteran tier (250).
+var advMasteryThresholds = []int{50, 100, 250}
 
-	// Overlevel penalty — reduces loot and XP for farming low-tier content
-	skillLevel := advEffectiveSkill(char, loc.Activity, bonuses)
-	overlevelMult := advOverlevelMultiplier(skillLevel, loc)
-
-	// Roll outcome
-	roll := rand.Float64() * 100
-
-	switch {
-	case roll < probs.DeathPct:
-		result.Outcome = AdvOutcomeDeath
-	case roll < probs.DeathPct+probs.EmptyPct:
-		// Activity-specific empty outcomes
-		result.Outcome = resolveAdvEmptyOutcome(loc, roll)
-	case roll < probs.DeathPct+probs.EmptyPct+probs.SuccessPct:
-		result.Outcome = AdvOutcomeSuccess
-	default:
-		result.Outcome = AdvOutcomeExceptional
-	}
-
-	// Near-death check: survived within 2% of death threshold
-	if result.Outcome != AdvOutcomeDeath && roll < probs.DeathPct+2 && roll >= probs.DeathPct {
-		result.NearDeath = true
-	}
-
-	// Generate loot for success/exceptional
-	if result.Outcome == AdvOutcomeSuccess || result.Outcome == AdvOutcomeExceptional {
-		result.LootItems = generateAdvLoot(loc, result.Outcome == AdvOutcomeExceptional, bonuses.LootQuality)
-		// Apply overlevel penalty to loot values
-		if overlevelMult < 1.0 {
-			for i := range result.LootItems {
-				result.LootItems[i].Value = max(1, int64(float64(result.LootItems[i].Value)*overlevelMult))
-			}
-		}
-		for _, item := range result.LootItems {
-			result.TotalLootValue += item.Value
+// advMasteryTier reports how many mastery thresholds a piece has crossed
+// (0–3) and the next threshold. nextThreshold is 0 when the piece has
+// already crossed every threshold.
+func advMasteryTier(actionsUsed int) (tier, nextThreshold int) {
+	for _, t := range advMasteryThresholds {
+		if actionsUsed >= t {
+			tier++
+		} else {
+			nextThreshold = t
+			break
 		}
 	}
+	return tier, nextThreshold
+}
 
-	// XP calculation
-	xp := advXPForOutcome(loc.Activity, loc.Tier, result.Outcome)
-	if result.Outcome == AdvOutcomeSuccess || result.Outcome == AdvOutcomeExceptional {
-		xp = advXPTable[loc.Activity][loc.Tier].Success
-		if result.Outcome == AdvOutcomeExceptional {
-			xp = advXPTable[loc.Activity][loc.Tier].Exceptional
-		}
+// advMasteryMarker returns the visual tier marker for a piece of equipment.
+// Empty for sub-50; ✦/✦✦/✦✦✦ at the 50/100/250 thresholds.
+func advMasteryMarker(actionsUsed int) string {
+	tier, _ := advMasteryTier(actionsUsed)
+	switch tier {
+	case 1:
+		return "✦"
+	case 2:
+		return "✦✦"
+	case 3:
+		return "✦✦✦"
 	}
+	return ""
+}
 
-	xpResult := applyXPBonuses(XPBonusParams{
-		BaseXP:        xp,
-		NearDeath:     result.NearDeath,
-		BonusMult:     bonuses.XPMultiplier,
-		Ironclad:      advEquippedArenaSets(equip)["ironclad"],
-		OverlevelMult: overlevelMult,
-	})
-	result.XPGained = xpResult.Total
-	result.XPBreakdown = xpResult.Breakdown
-
-	// Equipment degradation on bad outcomes
-	if result.Outcome == AdvOutcomeDeath || result.Outcome == AdvOutcomeEmpty ||
-		result.Outcome == AdvOutcomeCaveIn || result.Outcome == AdvOutcomeBear ||
-		result.Outcome == AdvOutcomeRiver {
-		result.EquipDamage = applyAdvEquipDegradation(equip, result.Outcome)
-		result.EquipBroken = advCheckBrokenEquipment(equip)
+// advSlotRelevantToActivity reports whether using a slot during the given
+// activity should count toward that slot's mastery. Combat actions exercise
+// the combat loadout (weapon/armor/helmet/boots); harvest actions exercise
+// only the tool. This is what makes mastery feel like "you used this
+// piece" rather than "you played for a while" — without this gate every
+// slot ticks in lockstep and the per-slot view is meaningless.
+func advSlotRelevantToActivity(slot EquipmentSlot, activity AdvActivityType) bool {
+	if isCombatActivity(activity) {
+		return slot == SlotWeapon || slot == SlotArmor || slot == SlotHelmet || slot == SlotBoots
 	}
+	if isHarvestActivity(activity) {
+		return slot == SlotTool
+	}
+	return false
+}
 
-	// Increment actions_used for equipment mastery
+// advMasteryRowSegment formats the `23/50`, `73/100 ✦`, `142/250 ✦✦`, or
+// `250 ✦✦✦` segment shown inline on each equipment row in the character
+// sheet so progress is visible at a glance — not just a tier marker that
+// flips on at 50/100/250 with nothing in between.
+func advMasteryRowSegment(actionsUsed int) string {
+	if actionsUsed <= 0 {
+		return ""
+	}
+	_, next := advMasteryTier(actionsUsed)
+	marker := advMasteryMarker(actionsUsed)
+	if next == 0 {
+		// At max — there's no "next" threshold to count toward.
+		return fmt.Sprintf("%d %s", actionsUsed, marker)
+	}
+	if marker == "" {
+		return fmt.Sprintf("%d/%d", actionsUsed, next)
+	}
+	return fmt.Sprintf("%d/%d %s", actionsUsed, next, marker)
+}
+
+// AdvMasteryRollup summarizes mastery state across all equipped slots so the
+// character sheet can show one informative aggregate line without a
+// per-slot block. AnyProgress is true when at least one slot has any
+// ActionsUsed — used to decide whether to show a "building up" hint when
+// no thresholds have crossed yet.
+type AdvMasteryRollup struct {
+	ThresholdsCrossed int     // raw count, pre-cap (sum across all slots)
+	MaxedSlots        int     // slots with all 3 thresholds crossed
+	Bonus             float64 // capped %, mirrors advEquipmentMasteryBonus
+	AnyProgress       bool
+}
+
+func advMasteryRollup(equip map[EquipmentSlot]*AdvEquipment) AdvMasteryRollup {
+	r := AdvMasteryRollup{}
 	for _, eq := range equip {
-		eq.ActionsUsed++
-	}
-
-	return result
-}
-
-// resolveAdvEmptyOutcome returns an activity-specific "empty" outcome.
-func resolveAdvEmptyOutcome(loc *AdvLocation, _ float64) AdvOutcomeType {
-	switch loc.Activity {
-	case AdvActivityMining:
-		// 40% chance of cave-in on "empty" result
-		if rand.Float64() < 0.4 {
-			return AdvOutcomeCaveIn
-		}
-		return AdvOutcomeEmpty
-
-	case AdvActivityForaging:
-		// Split empty into specific outcomes
-		r := rand.Float64()
-		switch {
-		case r < 0.35:
-			return AdvOutcomeHornets
-		case r < 0.55:
-			return AdvOutcomeBear
-		case r < 0.70:
-			return AdvOutcomeRiver
-		default:
-			return AdvOutcomeEmpty
-		}
-
-	case AdvActivityFishing:
-		// Fishing empty is just empty — no sub-outcomes
-		return AdvOutcomeEmpty
-
-	default:
-		return AdvOutcomeEmpty
-	}
-}
-
-// ── Eligible Locations for DM Menu ───────────────────────────────────────────
-
-type AdvEligibleLocation struct {
-	Location      *AdvLocation
-	InPenaltyZone bool
-	DeathPct      float64
-}
-
-func advEligibleLocations(char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, activity AdvActivityType, bonuses *AdvBonusSummary) []AdvEligibleLocation {
-	var eligible []AdvEligibleLocation
-	for _, loc := range allAdvLocations(activity) {
-		loc := loc
-		ok, penalty := advIsEligible(char, equip, &loc, bonuses)
-		if !ok {
+		if eq == nil {
 			continue
 		}
-		probs := calculateAdvProbabilities(char, equip, &loc, bonuses, penalty)
-		eligible = append(eligible, AdvEligibleLocation{
-			Location:      &loc,
-			InPenaltyZone: penalty,
-			DeathPct:      probs.DeathPct,
-		})
+		if eq.ActionsUsed > 0 {
+			r.AnyProgress = true
+		}
+		tier, _ := advMasteryTier(eq.ActionsUsed)
+		r.ThresholdsCrossed += tier
+		if tier == len(advMasteryThresholds) {
+			r.MaxedSlots++
+		}
 	}
-	return eligible
+	r.Bonus = advEquipmentMasteryBonus(equip)
+	return r
+}
+
+// advEquipmentMasteryBonus returns the loot-quality bonus from accumulated
+// mastery across all equipped slots. Each crossed threshold grants +1% loot
+// quality on its slot, capped at +10% total to keep balance reasonable.
+func advEquipmentMasteryBonus(equip map[EquipmentSlot]*AdvEquipment) float64 {
+	total := 0.0
+	for _, eq := range equip {
+		if eq == nil {
+			continue
+		}
+		for _, t := range advMasteryThresholds {
+			if eq.ActionsUsed >= t {
+				total++
+			}
+		}
+	}
+	if total > 10 {
+		total = 10
+	}
+	return total
 }
 
 // ── Party Bonus Check ────────────────────────────────────────────────────────

internal/plugin/adventure_activity_unified.go

@@ -0,0 +1,233 @@
+package plugin
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"gogobee/internal/db"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// AdvDailyActivity is one row of "what a player did" on a given UTC date.
+// Unifies the legacy adventure_activity_log table with the D&D-layer zone
+// run / expedition log tables so the daily report can render a coherent
+// view regardless of which subsystem the action ran through.
+type AdvDailyActivity struct {
+	UserID    id.UserID
+	Source    string // "zone_run" | "expedition" | "rest_legacy" | "legacy"
+	Activity  string // "zone" | "expedition" | "rest" | legacy activity_type
+	Location  string // zone display name or legacy location
+	Outcome   string // "completed" | "abandoned" | "boss_defeated" | "in_progress" | "rest" | legacy outcome
+	Summary   string // one-line human description
+	LootValue int64  // 0 for D&D-layer entries (loot stays in run/expedition state)
+	Timestamp time.Time
+}
+
+// loadAdvDailyActivity unions activity rows from every action surface for
+// the given UTC date (format "2006-01-02"). Returns map keyed by user_id.
+//
+// Sources (in chronological order on output):
+//   - adventure_activity_log (legacy, mostly !rest post-Phase-R)
+//   - dnd_zone_run         (zone runs whose last_action_at falls on date)
+//   - dnd_expedition_log   (expedition log entries dated today, deduped per
+//     expedition into one rollup line)
+//
+// Each user's slice is sorted oldest→newest. Empty slice when the player
+// had no activity on this date.
+func loadAdvDailyActivity(date string) (map[id.UserID][]AdvDailyActivity, error) {
+	out := make(map[id.UserID][]AdvDailyActivity)
+	d := db.Get()
+
+	// 1. Legacy adventure_activity_log
+	rows, err := d.Query(`
+		SELECT user_id, activity_type, COALESCE(location,''), outcome, loot_value, logged_at
+		FROM adventure_activity_log
+		WHERE logged_at >= ? AND logged_at < DATE(?, '+1 day')
+		ORDER BY logged_at`, date, date)
+	if err != nil {
+		return nil, fmt.Errorf("legacy log: %w", err)
+	}
+	for rows.Next() {
+		var (
+			uid, activity, location, outcome string
+			loot                             int64
+			ts                               time.Time
+		)
+		if err := rows.Scan(&uid, &activity, &location, &outcome, &loot, &ts); err != nil {
+			rows.Close()
+			return nil, fmt.Errorf("legacy log scan: %w", err)
+		}
+		userID := id.UserID(uid)
+		entry := AdvDailyActivity{
+			UserID:    userID,
+			Source:    "legacy",
+			Activity:  activity,
+			Location:  location,
+			Outcome:   outcome,
+			LootValue: loot,
+			Timestamp: ts,
+		}
+		if activity == string(AdvActivityRest) {
+			entry.Source = "rest_legacy"
+			entry.Summary = "Rested. Streak preserved."
+		} else {
+			entry.Summary = fmt.Sprintf("%s in %s (%s)", activity, location, outcome)
+		}
+		out[userID] = append(out[userID], entry)
+	}
+	rows.Close()
+
+	// Pre-load (user_id, zone_id) of active expeditions. Zone runs are now
+	// exclusively spawned by the expedition layer, and the expedition flips
+	// a region's run to abandoned on !region travel / inactivity timeout /
+	// forced extraction. Those transitions are internal — the expedition
+	// rollup below is the source of truth for the player. Skip zone_run
+	// entries that match an active expedition to avoid a misleading
+	// "Withdrew from <zone>" line while the player is still on it.
+	activeExp := make(map[string]struct{})
+	expRows, err := d.Query(`
+		SELECT user_id, zone_id FROM dnd_expedition
+		 WHERE status IN ('active','extracting')`)
+	if err != nil {
+		return nil, fmt.Errorf("active expeditions: %w", err)
+	}
+	for expRows.Next() {
+		var u, z string
+		if err := expRows.Scan(&u, &z); err != nil {
+			expRows.Close()
+			return nil, fmt.Errorf("active expedition scan: %w", err)
+		}
+		activeExp[u+"|"+z] = struct{}{}
+	}
+	expRows.Close()
+
+	// 2. dnd_zone_run — rows touched today. Progress count is derived
+	// from len(visited_nodes) — current_room retired in G9.
+	rows, err = d.Query(`
+		SELECT user_id, zone_id, visited_nodes, total_rooms, abandoned,
+		       boss_defeated, completed_at, last_action_at
+		FROM dnd_zone_run
+		WHERE last_action_at >= ? AND last_action_at < DATE(?, '+1 day')
+		ORDER BY last_action_at`, date, date)
+	if err != nil {
+		return nil, fmt.Errorf("zone runs: %w", err)
+	}
+	for rows.Next() {
+		var (
+			uid, zoneID                        string
+			visitedJSON                        string
+			totalRooms                         int
+			abandoned, bossDefeated            int
+			completedAt                        *time.Time
+			lastAction                         time.Time
+		)
+		if err := rows.Scan(&uid, &zoneID, &visitedJSON, &totalRooms,
+			&abandoned, &bossDefeated, &completedAt, &lastAction); err != nil {
+			rows.Close()
+			return nil, fmt.Errorf("zone run scan: %w", err)
+		}
+		var visited []string
+		_ = json.Unmarshal([]byte(visitedJSON), &visited)
+		currentRoom := len(visited) - 1
+		if currentRoom < 0 {
+			currentRoom = 0
+		}
+		if _, onExp := activeExp[uid+"|"+zoneID]; onExp {
+			continue
+		}
+		userID := id.UserID(uid)
+		zoneDef := zoneOrFallback(ZoneID(zoneID))
+
+		var outcome, summary string
+		switch {
+		case bossDefeated == 1:
+			outcome = "boss_defeated"
+			summary = fmt.Sprintf("Cleared %s — boss down (%d/%d rooms).", zoneDef.Display, currentRoom, totalRooms)
+		case completedAt != nil && abandoned == 0:
+			outcome = "completed"
+			summary = fmt.Sprintf("Cleared %s (%d/%d rooms).", zoneDef.Display, currentRoom, totalRooms)
+		case abandoned == 1:
+			outcome = "abandoned"
+			summary = fmt.Sprintf("Withdrew from %s at room %d/%d.", zoneDef.Display, currentRoom, totalRooms)
+		default:
+			outcome = "in_progress"
+			summary = fmt.Sprintf("Mid-run in %s (%d/%d rooms).", zoneDef.Display, currentRoom, totalRooms)
+		}
+		out[userID] = append(out[userID], AdvDailyActivity{
+			UserID:    userID,
+			Source:    "zone_run",
+			Activity:  "zone",
+			Location:  zoneDef.Display,
+			Outcome:   outcome,
+			Summary:   summary,
+			Timestamp: lastAction,
+		})
+	}
+	rows.Close()
+
+	// 3. dnd_expedition_log — pick the most-recent player-visible entry
+	//    per expedition for users active today. We rollup per expedition
+	//    rather than per row so the report doesn't list every camp/combat
+	//    beat separately.
+	rows, err = d.Query(`
+		SELECT e.user_id, e.zone_id, e.current_day, e.status,
+		       l.entry_type, l.summary, l.timestamp
+		FROM dnd_expedition_log l
+		JOIN dnd_expedition e ON e.expedition_id = l.expedition_id
+		WHERE l.timestamp >= ? AND l.timestamp < DATE(?, '+1 day')
+		  AND l.entry_type IN ('action','combat','event','recap')
+		ORDER BY l.timestamp`, date, date)
+	if err != nil {
+		return nil, fmt.Errorf("expedition log: %w", err)
+	}
+	type expKey struct {
+		uid, zoneID string
+	}
+	mostRecentExp := make(map[expKey]AdvDailyActivity)
+	for rows.Next() {
+		var (
+			uid, zoneID, status, entryType, summary string
+			currentDay                              int
+			ts                                      time.Time
+		)
+		if err := rows.Scan(&uid, &zoneID, &currentDay, &status,
+			&entryType, &summary, &ts); err != nil {
+			rows.Close()
+			return nil, fmt.Errorf("expedition log scan: %w", err)
+		}
+		userID := id.UserID(uid)
+		zoneDef := zoneOrFallback(ZoneID(zoneID))
+		k := expKey{string(userID), zoneID}
+		mostRecentExp[k] = AdvDailyActivity{
+			UserID:   userID,
+			Source:   "expedition",
+			Activity: "expedition",
+			Location: zoneDef.Display,
+			Outcome:  status,
+			Summary: fmt.Sprintf("Expedition in %s, day %d — %s",
+				zoneDef.Display, currentDay, summary),
+			Timestamp: ts,
+		}
+	}
+	rows.Close()
+	for _, entry := range mostRecentExp {
+		out[entry.UserID] = append(out[entry.UserID], entry)
+	}
+
+	// Sort each user's slice oldest→newest so callers can pick the
+	// representative entry deterministically (typically the latest).
+	for uid := range out {
+		entries := out[uid]
+		// Insertion-sort is fine here — slices are tiny.
+		for i := 1; i < len(entries); i++ {
+			for j := i; j > 0 && entries[j-1].Timestamp.After(entries[j].Timestamp); j-- {
+				entries[j-1], entries[j] = entries[j], entries[j-1]
+			}
+		}
+		out[uid] = entries
+	}
+
+	return out, nil
+}

internal/plugin/adventure_arena.go

@@ -80,7 +80,7 @@ func (p *AdventurePlugin) handleArenaMenu(ctx MessageContext) error {
 	}
 
 	if !char.Alive {
-		return p.SendDM(ctx.Sender, renderAdvDeathStatusDM(char))
+		return p.SendDM(ctx.Sender, renderAdvDeathStatusDM(char.UserID))
 	}
 
 	// Clear any pending entry when viewing menu
@@ -100,7 +100,11 @@ func (p *AdventurePlugin) handleArenaMenu(ctx MessageContext) error {
 
 	stats := loadArenaPersonalStats(ctx.Sender)
 	monster := arenaGetMonster(1, 1)
-	text := renderArenaStreakEntry(char, stats, tier, monster)
+	dndChar, err := p.ensureCharForDnDCmd(ctx.Sender, char)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Failed to load character sheet.")
+	}
+	text := renderArenaStreakEntry(dndChar, stats, tier, monster)
 	return p.SendDM(ctx.Sender, text)
 }
 
@@ -152,7 +156,7 @@ func (p *AdventurePlugin) confirmAndStartArenaRun(ctx MessageContext) error {
 	}
 
 	if !char.Alive {
-		return p.SendDM(ctx.Sender, renderAdvDeathStatusDM(char))
+		return p.SendDM(ctx.Sender, renderAdvDeathStatusDM(char.UserID))
 	}
 
 	// Re-check active run (could have changed since entry prompt)
@@ -187,12 +191,32 @@ func (p *AdventurePlugin) confirmAndStartArenaRun(ctx MessageContext) error {
 	return p.resolveArenaRound(ctx, run, char, equip, tier, monster)
 }
 
-// resolveArenaRound runs a single arena round through the combat engine and
-// dispatches to survival or death handlers.
-func (p *AdventurePlugin) resolveArenaRound(ctx MessageContext, run *ArenaRun, char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, tier *ArenaTier, monster *ArenaMonster) error {
-	result, condRepair := p.runArenaCombat(ctx.Sender, char, equip, monster, run.Round, run.Tier)
+// arenaBossNarration carries the staged-narration trio produced by
+// resolveArenaBoss: an intro line, the per-phase combat log, and the
+// outcome block (TwinBee mood + headline + dice summary).
+type arenaBossNarration struct {
+	intro   string
+	phases  []string
+	outcome string
+}
+
+// resolveArenaRound runs a single arena round through resolveArenaBoss
+// (zone-boss combat + staged narration) and threads the result into the
+// surrounding economic glue. There is no legacy fallback — a boss-flow
+// error surfaces to the player and aborts the round.
+func (p *AdventurePlugin) resolveArenaRound(ctx MessageContext, run *ArenaRun, char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, tier *ArenaTier, monster *ArenaMonster) error {
+	displayName, _ := loadDisplayName(ctx.Sender)
+	intro, phases, outcome, result, err := p.resolveArenaBoss(ctx.Sender, ArenaBossEncounter{
+		Tier:        run.Tier,
+		Round:       run.Round,
+		DisplayName: displayName,
+	})
+	if err != nil {
+		slog.Error("arena: boss flow failed", "user", ctx.Sender, "err", err)
+		return p.SendDM(ctx.Sender, "Arena combat encountered an error. Try again in a moment.")
+	}
+	bossNarr := &arenaBossNarration{intro: intro, phases: phases, outcome: outcome}
 
-	// Apply event-based equipment degradation
 	degradation := combatDegradation(result, equip)
 	for slot, eq := range equip {
 		if d, ok := degradation[slot]; ok && d > 0 {
@@ -200,9 +224,7 @@ func (p *AdventurePlugin) resolveArenaRound(ctx MessageContext, run *ArenaRun, c
 		}
 	}
 
-	deathSaved := checkDeathSaveEvent(result.Events)
-
-	if deathSaved {
+	if checkDeathSaveEvent(result.Events) {
 		now := time.Now().UTC()
 		char.DeathReprieveLast = &now
 		if err := saveAdvCharacter(char); err != nil {
@@ -211,15 +233,9 @@ func (p *AdventurePlugin) resolveArenaRound(ctx MessageContext, run *ArenaRun, c
 	}
 
 	if !result.PlayerWon {
-		return p.resolveArenaDeath(ctx, run, char, tier, monster, result)
+		return p.resolveArenaDeath(ctx, run, char, tier, monster, result, bossNarr)
 	}
-
-	// Misty condition repair (post-combat)
-	if condRepair > 0 {
-		npcRepairMostDamaged(ctx.Sender, equip, condRepair)
-	}
-
-	return p.resolveArenaSurvival(ctx, run, char, tier, monster, result)
+	return p.resolveArenaSurvival(ctx, run, char, tier, monster, result, bossNarr)
 }
 
 func (p *AdventurePlugin) handleArenaCancel(ctx MessageContext) error {
@@ -259,8 +275,7 @@ func (p *AdventurePlugin) handleArenaBail(ctx MessageContext) error {
 }
 
 func (p *AdventurePlugin) handleArenaStatus(ctx MessageContext) error {
-	char, err := loadAdvCharacter(ctx.Sender)
-	if err != nil {
+	if _, err := loadAdvCharacter(ctx.Sender); err != nil {
 		return p.SendDM(ctx.Sender, "No adventurer found.")
 	}
 
@@ -269,7 +284,7 @@ func (p *AdventurePlugin) handleArenaStatus(ctx MessageContext) error {
 		return p.SendDM(ctx.Sender, "No active arena run. Start one with `!arena`.")
 	}
 
-	return p.SendDM(ctx.Sender, renderArenaStatus(run, char))
+	return p.SendDM(ctx.Sender, renderArenaStatus(run))
 }
 
 func (p *AdventurePlugin) handleArenaStats(ctx MessageContext) error {
@@ -279,7 +294,14 @@ func (p *AdventurePlugin) handleArenaStats(ctx MessageContext) error {
 	}
 
 	stats := loadArenaPersonalStats(ctx.Sender)
-	return p.SendDM(ctx.Sender, renderArenaPersonalStats(char, stats))
+	wins, losses := char.ArenaWins, char.ArenaLosses
+	if meta, err := loadPlayerMeta(ctx.Sender); err == nil {
+		wins, losses = meta.ArenaWins, meta.ArenaLosses
+	} else {
+		slog.Error("player_meta: arena stats read failed, falling back to AdvCharacter", "user", ctx.Sender, "err", err)
+	}
+	displayName, _ := loadDisplayName(ctx.Sender)
+	return p.SendDM(ctx.Sender, renderArenaPersonalStats(displayName, wins, losses, stats))
 }
 
 func (p *AdventurePlugin) handleArenaLeaderboard(ctx MessageContext) error {
@@ -298,9 +320,12 @@ func (p *AdventurePlugin) handleArenaLeaderboard(ctx MessageContext) error {
 var arenaStreakEuroMultiplier = [6]float64{0, 1.0, 1.5, 2.0, 2.75, 4.0} // index = tier
 var arenaStreakXPMultiplier = [6]float64{0, 1.0, 1.2, 1.5, 1.85, 2.5}   // index = tiers won
 
-func (p *AdventurePlugin) resolveArenaSurvival(ctx MessageContext, run *ArenaRun, char *AdventureCharacter, tier *ArenaTier, monster *ArenaMonster, result CombatResult) error {
-	// Calculate reward — accumulate in tier earnings, not credited yet
-	reward := arenaRoundReward(tier, run.Round, char.CombatLevel)
+func (p *AdventurePlugin) resolveArenaSurvival(ctx MessageContext, run *ArenaRun, char *AdventureCharacter, tier *ArenaTier, monster *ArenaMonster, result CombatResult, bossNarr *arenaBossNarration) error {
+	// Calculate reward — accumulate in tier earnings, not credited yet.
+	// Skill bonus scales off DnDCharacter.Level (post-L2: arena is on the
+	// D&D level scale, not the legacy CombatLevel).
+	skillLevel := arenaDnDLevelOrZero(ctx.Sender)
+	reward := arenaRoundReward(tier, run.Round, skillLevel)
 	run.TierEarnings += reward
 	run.RoundsSurvived++
 	run.LastMonster = monster.Name
@@ -316,10 +341,9 @@ func (p *AdventurePlugin) resolveArenaSurvival(ctx MessageContext, run *ArenaRun
 	}
 	run.XPAccumulated += battleXP
 
-	// Render combat log as phased messages + final outcome
-	phaseMessages := RenderCombatLogArena(result, char.DisplayName, monster.Name)
+	phaseMessages := bossFlowPhaseMessages(bossNarr)
 	phaseMessages = p.prependCraftNarrative(ctx.Sender, phaseMessages)
-	finalMessage := renderArenaCombatFinalMessage(result, monster, reward, battleXP, run.Round)
+	finalMessage := bossNarr.outcome + fmt.Sprintf("\n🏆 +%d XP | €%d earned", battleXP, reward)
 
 	// Suppress the "(at risk)" line on the tier-completing round — those earnings
 	// are about to be locked in by the tier-complete branch below, so labelling
@@ -363,7 +387,7 @@ func (p *AdventurePlugin) resolveArenaSurvival(ctx MessageContext, run *ArenaRun
 			finalMessage += fmt.Sprintf("\n🏆 **Tier %d cleared!** Round earnings: €%d + completion bonus: €%d (×%.1f streak)\n",
 				tier.Number, tierRaw, tier.CompletionBonus, multiplier)
 
-			done := p.sendCombatMessages(ctx.Sender, phaseMessages, finalMessage)
+			done := p.sendZoneCombatMessages(ctx.Sender, phaseMessages, finalMessage)
 			<-done
 			return p.arenaCompleteSession(ctx.Sender, run, char, "")
 		}
@@ -379,10 +403,11 @@ func (p *AdventurePlugin) resolveArenaSurvival(ctx MessageContext, run *ArenaRun
 
 		if dropped := p.arenaRollHelmetDrop(ctx.Sender, run.Tier); dropped != nil {
 			finalMessage += "\n" + renderArenaHelmetDrop(dropped)
-			p.postArenaDropAnnouncement(char.DisplayName, dropped)
+			displayName, _ := loadDisplayName(ctx.Sender)
+			p.postArenaDropAnnouncement(displayName, dropped)
 		}
 
-		done := p.sendCombatMessages(ctx.Sender, phaseMessages, finalMessage)
+		done := p.sendZoneCombatMessages(ctx.Sender, phaseMessages, finalMessage)
 		go func() {
 			<-done
 			p.arenaCountdown(ctx.Sender, run)
@@ -404,17 +429,39 @@ func (p *AdventurePlugin) resolveArenaSurvival(ctx MessageContext, run *ArenaRun
 		finalMessage += "`!arena fight` — Face this opponent"
 	}
 
-	p.sendCombatMessages(ctx.Sender, phaseMessages, finalMessage)
+	// Fire-and-forget: no post-flush work; blocking would stall the
+	// round-advance handler behind streamed pacing. Contract is honored
+	// by the explicit discard — see sendZoneCombatMessages comment.
+	_ = p.sendZoneCombatMessages(ctx.Sender, phaseMessages, finalMessage)
 	return nil
 }
 
-func (p *AdventurePlugin) resolveArenaDeath(ctx MessageContext, run *ArenaRun, char *AdventureCharacter, tier *ArenaTier, monster *ArenaMonster, result CombatResult) error {
+// bossFlowPhaseMessages prepends the resolveArenaBoss intro line to the
+// staged combat phases, mirroring streamOrSend's intro+phases pattern in
+// dnd_zone_cmd.go.
+func bossFlowPhaseMessages(n *arenaBossNarration) []string {
+	if n.intro == "" {
+		return append([]string{}, n.phases...)
+	}
+	out := make([]string, 0, len(n.phases)+1)
+	out = append(out, n.intro)
+	out = append(out, n.phases...)
+	return out
+}
+
+func (p *AdventurePlugin) resolveArenaDeath(ctx MessageContext, run *ArenaRun, char *AdventureCharacter, tier *ArenaTier, monster *ArenaMonster, result CombatResult, bossNarr *arenaBossNarration) error {
 	run.LastMonster = monster.Name
 	lostEarnings := run.Earnings + run.TierEarnings
 
-	phaseMessages := RenderCombatLogArena(result, char.DisplayName, monster.Name)
+	phaseMessages := bossFlowPhaseMessages(bossNarr)
 
-	dt := transitionDeath(DeathTransitionParams{Char: char})
+	arenaPet, _ := loadPetState(char.UserID)
+	dt := transitionDeath(DeathTransitionParams{
+		Char:          char,
+		Pet:           arenaPet,
+		Source:        "arena",
+		DeathLocation: "the Arena",
+	})
 
 	char.ArenaLosses++
 	char.CombatXP += arenaParticipationXP
@@ -437,7 +484,7 @@ func (p *AdventurePlugin) resolveArenaDeath(ctx MessageContext, run *ArenaRun, c
 	insertArenaHistory(run.UserID, run.StartTier, run.Tier, run.RoundsSurvived, 0, "dead", monster.Name)
 	upsertArenaStats(run.UserID, 0, true, run.Tier)
 
-	finalMsg := renderArenaCombatFinalMessage(result, monster, 0, arenaParticipationXP, run.Round)
+	finalMsg := bossNarr.outcome + fmt.Sprintf("\n+%d XP (participation) | Back tomorrow.", arenaParticipationXP)
 	if dt.PetRecovered {
 		finalMsg += fmt.Sprintf("\n\nYour pet dragged you out of the arena. Death timer reduced. All session earnings forfeited.")
 	} else {
@@ -450,12 +497,13 @@ func (p *AdventurePlugin) resolveArenaDeath(ctx MessageContext, run *ArenaRun, c
 		}
 	}
 
-	done := p.sendCombatMessages(ctx.Sender, phaseMessages, finalMsg)
+	done := p.sendZoneCombatMessages(ctx.Sender, phaseMessages, finalMsg)
 
 	if dt.PetRecovered {
 		gr := gamesRoom()
 		if gr != "" {
-			_ = p.SendMessage(gr, petDitchRecoveryGameRoom(char.DisplayName, char.PetName, true))
+			displayName, _ := loadDisplayName(ctx.Sender)
+			_ = p.SendMessage(gr, petDitchRecoveryGameRoom(displayName, char.PetName, true))
 		}
 	}
 
@@ -534,8 +582,9 @@ func (p *AdventurePlugin) arenaCompleteSession(userID id.UserID, run *ArenaRun,
 		// Room announcement for T5
 		gr := gamesRoom()
 		if gr != "" {
+			displayName, _ := loadDisplayName(userID)
 			announce := fmt.Sprintf("🏆 **%s has conquered the Arena.** Tier 5 streak. €%d earned. That Which Has Always Been has fallen.",
-				char.DisplayName, run.Earnings)
+				displayName, run.Earnings)
 			p.SendMessage(id.RoomID(gr), announce)
 		}
 	}
@@ -549,9 +598,10 @@ func (p *AdventurePlugin) arenaCompleteSession(userID id.UserID, run *ArenaRun,
 			// Game room announcement
 			gr := gamesRoom()
 			if gr != "" {
+				displayName, _ := loadDisplayName(userID)
 				p.SendMessage(id.RoomID(gr), fmt.Sprintf(
 					"🏆 %s walked out of the arena with the Gladiator's Helm. Tier %d streak. They had the option to stop. They did not stop.",
-					char.DisplayName, tiersWon))
+					displayName, tiersWon))
 			}
 		}
 	}
@@ -594,37 +644,15 @@ func (p *AdventurePlugin) arenaProcessBail(userID id.UserID, run *ArenaRun) erro
 
 // ── Combat Math ─────────────────────────────────────────────────────────────
 
-func arenaDeathChance(monster *ArenaMonster, char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment) float64 {
-	baseDeath := monster.BaseLethality
-	levelMod := float64(monster.ThreatLevel-char.CombatLevel) * 0.015
-	skillMod := math.Max(0, 0.25-float64(char.CombatLevel)*0.008)
-
-	// Average equipment tier → up to 15% reduction at max gear (tier 5 avg = 0.15)
-	var totalTier float64
-	count := 0
-	for _, slot := range allSlots {
-		if eq, ok := equip[slot]; ok {
-			totalTier += float64(eq.Tier)
-			count++
-		}
+// arenaDnDLevelOrZero returns the player's DnDCharacter.Level, or 0 if no
+// sheet exists. Arena enters this path after combat (which migrates), so a
+// zero return is rare and the caller's MinLevel gate handles it correctly.
+func arenaDnDLevelOrZero(userID id.UserID) int {
+	c, err := LoadDnDCharacter(userID)
+	if err != nil || c == nil {
+		return 0
 	}
-	avgTier := 0.0
-	if count > 0 {
-		avgTier = totalTier / float64(count)
-	}
-	equipMod := avgTier * 0.03 // 0 at tier 0, 0.15 at tier 5
-
-	// Housing HP bonus reduces death chance
-	houseMod := char.HouseHPBonus() // 0-20% based on house tier
-
-	// Pet morning defense buff (cat offering / dog smothering)
-	petDefMod := 0.0
-	if char.PetMorningDefense {
-		petDefMod = 0.05
-	}
-
-	deathChance := baseDeath + levelMod - equipMod + skillMod - houseMod - petDefMod
-	return math.Max(0.01, math.Min(0.98, deathChance))
+	return c.Level
 }
 
 func arenaRoundReward(tier *ArenaTier, round int, battleSkill int) int64 {
@@ -742,16 +770,11 @@ func (p *AdventurePlugin) arenaCountdown(userID id.UserID, run *ArenaRun) {
 		return
 	}
 
-	char, err := loadAdvCharacter(userID)
-	if err != nil {
-		slog.Error("arena: failed to load character for auto-advance", "user", userID, "err", err)
-		p.arenaProcessBail(userID, freshRun)
-		return
-	}
-
-	// Level gate for next tier
-	if char.CombatLevel < nextTier.MinLevel {
-		p.SendDM(userID, renderArenaLevelGate(nextTier, char.CombatLevel)+"\n\nYour accumulated rewards have been paid out.")
+	// Level gate for next tier — uses DnDCharacter.Level (post-L2 arena
+	// is on the D&D level scale).
+	playerLevel := arenaDnDLevelOrZero(userID)
+	if playerLevel < nextTier.MinLevel {
+		p.SendDM(userID, renderArenaLevelGate(nextTier, playerLevel)+"\n\nYour accumulated rewards have been paid out.")
 		p.arenaProcessBail(userID, freshRun)
 		return
 	}
@@ -945,7 +968,7 @@ func loadArenaLeaderboard() ([]ArenaLeaderboardEntry, error) {
 		       s.total_earnings, s.highest_tier, s.tier5_completions,
 		       s.total_runs, s.total_deaths
 		FROM arena_stats s
-		LEFT JOIN adventure_characters c ON c.user_id = s.user_id
+		LEFT JOIN player_meta c ON c.user_id = s.user_id
 		ORDER BY s.total_earnings DESC
 		LIMIT 10`)
 	if err != nil {
@@ -1206,3 +1229,93 @@ func (p *AdventurePlugin) arenaRollGladiatorHelm(userID id.UserID, maxTierCleare
 
 	return "The Gladiator's Helm"
 }
+
+// ── Arena boss-flow round resolver ──────────────────────────────────────────
+//
+// resolveArenaBoss is the arena combat path: a single arena round
+// routed through runZoneCombat + renderBossOutcome so the player sees
+// the same staged narration zone bosses use (Nat20/Nat1 mood lines,
+// phase-two barb on T3+, BossDeath/PlayerDeath flavor, dice summary).
+
+// ArenaBossEncounter is the single-round input for resolveArenaBoss.
+// Tier and Round identify the arenaBosses entry; DisplayName is the
+// player-facing combatant label, falling back to "You" when empty.
+type ArenaBossEncounter struct {
+	Tier        int
+	Round       int
+	DisplayName string
+}
+
+// resolveArenaBoss runs one arena round through the zone-boss combat +
+// narration stack. Returns the staged-narration trio that the caller
+// streams via sendZoneCombatMessages, plus the underlying CombatResult
+// so the surrounding economic glue (rewards, achievements, helmet
+// drops, death flag) can branch on PlayerWon and inspect events.
+//
+// Side effects belong to the caller: this helper does not touch
+// ArenaRun state, payout, or arena history rows.
+func (p *AdventurePlugin) resolveArenaBoss(userID id.UserID, enc ArenaBossEncounter) (intro string, phases []string, outcome string, result CombatResult, err error) {
+	monster, ok := arenaBosses[arenaBossID(enc.Tier, enc.Round)]
+	if !ok {
+		err = fmt.Errorf("arena: no bestiary entry for tier %d round %d", enc.Tier, enc.Round)
+		return
+	}
+
+	preHP, _ := dndHPSnapshot(userID)
+	// Arena uses boss-shaped bestiary entries; give them the wider phase
+	// budget so the round resolver isn't decided by tiebreak.
+	// Arena has no run-state DMMood; pass neutral (50).
+	result, err = p.runZoneCombat(userID, monster, enc.Tier, bossCombatPhases, 50)
+	if err != nil {
+		return
+	}
+	postHP, maxHP := dndHPSnapshot(userID)
+
+	// Synthetic run/room IDs so twinBeeLine seeds deterministically per
+	// fight without colliding with zone runs. Arena fights aren't tied
+	// to a DungeonRun so MoodEvents don't apply — the Nat20/Nat1 counts
+	// drive narration directly.
+	runID := fmt.Sprintf("arena-%s-t%d-r%d", string(userID), enc.Tier, enc.Round)
+	roomIdx := enc.Tier*10 + enc.Round
+	nat20s, nat1s := countNat20sAnd1s(result)
+
+	playerName := enc.DisplayName
+	if playerName == "" {
+		playerName = "You"
+	}
+
+	intro = fmt.Sprintf("🏟️ **Arena T%d R%d — %s** (HP %d, AC %d)",
+		enc.Tier, enc.Round, monster.Name, monster.HP, monster.AC)
+	phases = RenderCombatLog(result, playerName, monster.Name)
+
+	outcome = renderBossOutcome(BossOutcomeInputs{
+		ZoneID:          ZoneArena,
+		RunID:           runID,
+		RoomIdx:         roomIdx,
+		Monster:         monster,
+		Result:          result,
+		PreHP:           preHP,
+		PostHP:          postHP,
+		MaxHP:           maxHP,
+		PhaseTwoAt:      arenaBossPhaseTwoAt(enc.Tier),
+		Nat20s:          nat20s,
+		Nat1s:           nat1s,
+		DefeatHeadline:  fmt.Sprintf("💀 **%s** stands over your body. The arena collects its fee.", monster.Name),
+		VictoryHeadline: fmt.Sprintf("🏆 **%s** falls. You finished at **%d/%d HP**.", monster.Name, postHP, maxHP),
+	})
+	return
+}
+
+// countNat20sAnd1s scans a CombatResult for d20 rolls and returns the
+// nat-20 / nat-1 counts. Mirrors scanMoodEventsFromCombat's tally but
+// without writing run-scoped mood events (arena has no DungeonRun).
+func countNat20sAnd1s(result CombatResult) (nat20s, nat1s int) {
+	for _, e := range result.Events {
+		if e.Roll == 20 {
+			nat20s++
+		} else if e.Roll == 1 {
+			nat1s++
+		}
+	}
+	return
+}

internal/plugin/adventure_arena_bossflow_test.go

@@ -0,0 +1,189 @@
+package plugin
+
+import (
+	"strings"
+	"testing"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// Phase L2 step 4 — smoke test for resolveArenaBoss. Asserts the helper
+// returns staged narration (intro + phases + outcome) for a representative
+// arena round and that the outcome carries the boss-flow signatures: the
+// arena-styled headline and a dice-roll summary.
+
+func TestResolveArenaBoss_T1Round1_Smoke(t *testing.T) {
+	setupAuditTestDB(t)
+	uid := id.UserID("@arena-bossflow:example")
+	t.Cleanup(func() { cleanupZoneRuns(uid) })
+
+	if err := createAdvCharacter(uid, "bossflow"); err != nil {
+		t.Fatalf("createAdvCharacter: %v", err)
+	}
+	c := &DnDCharacter{
+		UserID: uid, Race: RaceHuman, Class: ClassFighter, Level: 5,
+		STR: 18, DEX: 14, CON: 16, INT: 10, WIS: 10, CHA: 10,
+		HPMax: 60, HPCurrent: 60, ArmorClass: 18,
+	}
+	if err := SaveDnDCharacter(c); err != nil {
+		t.Fatalf("SaveDnDCharacter: %v", err)
+	}
+
+	p := &AdventurePlugin{}
+	intro, phases, outcome, result, err := p.resolveArenaBoss(uid, ArenaBossEncounter{
+		Tier: 1, Round: 1, DisplayName: "Smoke",
+	})
+	if err != nil {
+		t.Fatalf("resolveArenaBoss: %v", err)
+	}
+	if intro == "" {
+		t.Error("intro empty")
+	}
+	if !strings.Contains(intro, "Arena T1 R1") {
+		t.Errorf("intro missing tier/round label: %q", intro)
+	}
+	if len(phases) == 0 {
+		t.Error("phases empty — combat log did not render")
+	}
+	if outcome == "" {
+		t.Error("outcome empty")
+	}
+	if result.PlayerWon {
+		// On a win the headline mentions "falls"; on a loss "stands over".
+		if !strings.Contains(outcome, "falls") {
+			t.Errorf("win outcome missing 'falls' headline: %q", outcome)
+		}
+	} else {
+		if !strings.Contains(outcome, "stands over") {
+			t.Errorf("loss outcome missing defeat headline: %q", outcome)
+		}
+	}
+}
+
+func TestResolveArenaBoss_BadTierRound(t *testing.T) {
+	setupAuditTestDB(t)
+	uid := id.UserID("@arena-bossflow-bad:example")
+	if err := createAdvCharacter(uid, "bad"); err != nil {
+		t.Fatalf("createAdvCharacter: %v", err)
+	}
+	p := &AdventurePlugin{}
+	if _, _, _, _, err := p.resolveArenaBoss(uid, ArenaBossEncounter{Tier: 9, Round: 9}); err == nil {
+		t.Error("expected error for unknown tier/round")
+	}
+}
+
+func TestArenaBossPhaseTwoAt(t *testing.T) {
+	cases := []struct {
+		tier int
+		want float64
+	}{{1, 0}, {2, 0}, {3, 0.5}, {4, 0.5}, {5, 0.5}}
+	for _, c := range cases {
+		if got := arenaBossPhaseTwoAt(c.tier); got != c.want {
+			t.Errorf("arenaBossPhaseTwoAt(%d)=%v want %v", c.tier, got, c.want)
+		}
+	}
+}
+
+// Phase L2 step 4b — staged-narration assembly. The intro line leads,
+// followed by the combat-log phases, mirroring streamOrSend's
+// intro+phases pattern in dnd_zone_cmd.go.
+func TestBossFlowPhaseMessages(t *testing.T) {
+	n := &arenaBossNarration{
+		intro:  "🏟️ **Arena T1 R1 — Slug** (HP 12, AC 10)",
+		phases: []string{"phase A", "phase B"},
+	}
+	got := bossFlowPhaseMessages(n)
+	if len(got) != 3 {
+		t.Fatalf("len = %d, want 3 (intro + 2 phases): %v", len(got), got)
+	}
+	if got[0] != n.intro {
+		t.Errorf("got[0] = %q, want intro %q", got[0], n.intro)
+	}
+	if got[1] != "phase A" || got[2] != "phase B" {
+		t.Errorf("phases out of order: %v", got)
+	}
+
+	// No intro → just the phases, unchanged.
+	n2 := &arenaBossNarration{phases: []string{"only"}}
+	got2 := bossFlowPhaseMessages(n2)
+	if len(got2) != 1 || got2[0] != "only" {
+		t.Errorf("no-intro case: got %v want [only]", got2)
+	}
+}
+
+// Phase L2 step 8 — assert that an arena win surfaces both the staged
+// combat log (RenderCombatLog phases prepended by the arena intro) and a
+// TwinBee BossDeath flavor line in the outcome block. Drives
+// renderBossOutcome directly with a forced-win CombatResult so the
+// assertion is RNG-free; the resolveArenaBoss smoke test above already
+// exercises the live combat path end-to-end.
+func TestArenaBossOutcome_WinSurfacesStagedLogAndBossDeath(t *testing.T) {
+	monster := arenaBosses[arenaBossID(1, 1)]
+	result := CombatResult{
+		PlayerWon:     true,
+		PlayerStartHP: 60, PlayerEndHP: 42,
+		EnemyStartHP: monster.HP, EnemyEndHP: 0,
+		Events: []CombatEvent{
+			{Round: 1, Phase: "attack", Actor: "player", Action: "hit", Roll: 14, RollAgainst: monster.AC, Damage: 10, EnemyHP: monster.HP - 10, PlayerHP: 60},
+			{Round: 2, Phase: "attack", Actor: "player", Action: "crit", Roll: 20, RollAgainst: monster.AC, Damage: monster.HP - 10, EnemyHP: 0, PlayerHP: 42},
+		},
+		TotalRounds: 2,
+	}
+
+	// Staged combat log — same call resolveArenaBoss makes for `phases`.
+	phases := RenderCombatLog(result, "Champion", monster.Name)
+	if len(phases) == 0 {
+		t.Fatal("RenderCombatLog returned no phases for a winning result")
+	}
+
+	victoryHeadline := "🏆 **" + monster.Name + "** falls (HP " + "60" + "→" + "42" + " / 60)."
+	outcome := renderBossOutcome(BossOutcomeInputs{
+		ZoneID:          ZoneArena,
+		RunID:           "arena-stagedlog-test",
+		RoomIdx:         11,
+		Monster:         monster,
+		Result:          result,
+		PreHP:           60, PostHP: 42, MaxHP: 60,
+		PhaseTwoAt:      arenaBossPhaseTwoAt(1),
+		Nat20s:          1,
+		Nat1s:           0,
+		DefeatHeadline:  "unused",
+		VictoryHeadline: victoryHeadline,
+	})
+
+	if !strings.Contains(outcome, "🎭 **TwinBee:**") {
+		t.Errorf("outcome missing TwinBee narration line: %q", outcome)
+	}
+	if !strings.Contains(outcome, victoryHeadline) {
+		t.Errorf("outcome missing victory headline: %q", outcome)
+	}
+	if !strings.Contains(outcome, "🎲 d20 —") {
+		t.Errorf("outcome missing dice-roll summary: %q", outcome)
+	}
+	// BossDeath line must be present — the TwinBee line preceding the
+	// victory headline is sourced from flavor.BossDeath via twinBeeLine.
+	headlineIdx := strings.Index(outcome, victoryHeadline)
+	if headlineIdx <= 0 {
+		t.Fatalf("victory headline not after a TwinBee line: %q", outcome)
+	}
+	prefix := outcome[:headlineIdx]
+	if !strings.Contains(prefix, "🎭 **TwinBee:**") {
+		t.Errorf("BossDeath TwinBee line should precede victory headline; prefix=%q", prefix)
+	}
+}
+
+func TestArenaBosses_AllTiersPopulated(t *testing.T) {
+	for tier := 1; tier <= 5; tier++ {
+		for round := 1; round <= 4; round++ {
+			id := arenaBossID(tier, round)
+			m, ok := arenaBosses[id]
+			if !ok {
+				t.Errorf("arenaBosses missing %s", id)
+				continue
+			}
+			if m.HP <= 0 || m.AC <= 0 || m.Attack <= 0 {
+				t.Errorf("%s has bad stats: HP=%d AC=%d ATK=%d", id, m.HP, m.AC, m.Attack)
+			}
+		}
+	}
+}

internal/plugin/adventure_arena_combat.go

@@ -1,36 +1,3 @@
 package plugin
 
-import (
-	"fmt"
-	"math/rand/v2"
-)
-
 const arenaParticipationXP = 60
-
-// ── Closer Lines ───────────────────────────────────────────────────────────
-
-func arenaWinCloser(loserName string, lastRound int) string {
-	closers := []string{
-		"%s fought. It counts.",
-		"%s will be back. The arena keeps score.",
-		fmt.Sprintf("%%s has until tomorrow to think about round %d.", lastRound),
-		"%s gave you more trouble than you'd like to admit. They don't need to know that.",
-		"%s loses this one. The next one is an open question.",
-		"%s came here to fight and did. The result is a separate matter.",
-		"%s is already planning the rematch. You can feel it.",
-	}
-	return fmt.Sprintf(closers[rand.IntN(len(closers))], loserName)
-}
-
-func arenaLoseCloser(winnerName string, lastRound int) string {
-	closers := []string{
-		"You fought. It counts.",
-		"You'll be back. The arena keeps score.",
-		fmt.Sprintf("You have until tomorrow to think about round %d.", lastRound),
-		fmt.Sprintf("You gave %s more trouble than they'd like to admit. Small comfort. Still comfort.", winnerName),
-		"You lose this one. The next one is an open question.",
-		"You came here to fight and did. The result is a separate matter.",
-		fmt.Sprintf("%s won this one. You're already planning the rematch.", winnerName),
-	}
-	return closers[rand.IntN(len(closers))]
-}

internal/plugin/adventure_arena_monsters.go

@@ -1,5 +1,7 @@
 package plugin
 
+import "fmt"
+
 // ── Arena Tier & Monster Definitions ────────────────────────────────────────
 //
 // Five tiers, four monsters each. Death chance, rewards, and XP scale with tier.
@@ -27,7 +29,7 @@ type ArenaMonster struct {
 var arenaTiers = [5]ArenaTier{
 	// Tier 1 — Scrubs
 	{
-		Number: 1, Name: "Scrubs", MinLevel: 1,
+		Number: 1, Name: "Scrubs", MinLevel: 1, // DnD Level 1–3
 		BasePayout: 150, SkillMultiplier: 1.0, CompletionBonus: 2500, BattleXP: 10,
 		Monsters: [4]ArenaMonster{
 			{
@@ -54,7 +56,7 @@ var arenaTiers = [5]ArenaTier{
 	},
 	// Tier 2 — Thugs
 	{
-		Number: 2, Name: "Thugs", MinLevel: 10,
+		Number: 2, Name: "Thugs", MinLevel: 4, // DnD Level 4–7
 		BasePayout: 500, SkillMultiplier: 2.5, CompletionBonus: 10000, BattleXP: 25,
 		Monsters: [4]ArenaMonster{
 			{
@@ -82,7 +84,7 @@ var arenaTiers = [5]ArenaTier{
 	},
 	// Tier 3 — Brutes
 	{
-		Number: 3, Name: "Brutes", MinLevel: 25,
+		Number: 3, Name: "Brutes", MinLevel: 8, // DnD Level 8–12
 		BasePayout: 1500, SkillMultiplier: 6.0, CompletionBonus: 30000, BattleXP: 60,
 		Monsters: [4]ArenaMonster{
 			{
@@ -111,7 +113,7 @@ var arenaTiers = [5]ArenaTier{
 	},
 	// Tier 4 — Horrors
 	{
-		Number: 4, Name: "Horrors", MinLevel: 45,
+		Number: 4, Name: "Horrors", MinLevel: 13, // DnD Level 13–17
 		BasePayout: 5000, SkillMultiplier: 12.0, CompletionBonus: 100000, BattleXP: 120,
 		Monsters: [4]ArenaMonster{
 			{
@@ -141,7 +143,7 @@ var arenaTiers = [5]ArenaTier{
 	},
 	// Tier 5 — World Eaters
 	{
-		Number: 5, Name: "World Eaters", MinLevel: 70,
+		Number: 5, Name: "World Eaters", MinLevel: 18, // DnD Level 18–20
 		BasePayout: 15000, SkillMultiplier: 25.0, CompletionBonus: 500000, BattleXP: 250,
 		Monsters: [4]ArenaMonster{
 			{
@@ -190,6 +192,93 @@ func arenaGetMonster(tier, round int) *ArenaMonster {
 	return &t.Monsters[round-1]
 }
 
+// ── Adv 2.0 boss-flow bestiary (Phase L2 step 3) ────────────────────────────
+//
+// arenaBosses re-shapes the legacy arenaTiers data into boss-shaped
+// DnDMonsterTemplate entries so resolveArenaBoss (Phase L2 step 4) can
+// run an arena fight through the same runZoneCombat → renderBossOutcome
+// flow that zone bosses use. Keyed by arenaBossID(tier, round) — IDs
+// are namespaced "arena_t<tier>_r<round>" so they don't collide with
+// dndBestiary keys.
+//
+// HP/AC/Attack are first-pass tier-banded values; BaseLethality biases
+// each monster up or down within its tier band so round-1 is the
+// weakest fight and round-4 is the cap. Tuning is ongoing against
+// playtest data (gogobee_legacy_migration.md §4 Risk).
+var arenaBosses = map[string]DnDMonsterTemplate{}
+
+// arenaBossID composes the canonical arena bestiary key.
+func arenaBossID(tier, round int) string {
+	return fmt.Sprintf("arena_t%d_r%d", tier, round)
+}
+
+// arenaBossPhaseTwoAt returns the PhaseTwoAt fraction (of MaxHP) for an
+// arena fight at the given tier. T1–T2 = no phase two; T3+ = 50% HP.
+// The T4–T5 flavor barb piggybacks on the standard phase-two narration
+// path through ZoneArena's bossPhaseTwoPool (populated alongside arena
+// flavor when those lines land).
+func arenaBossPhaseTwoAt(tier int) float64 {
+	if tier >= 3 {
+		return 0.5
+	}
+	return 0
+}
+
+// arenaTierBaseStats returns the (HP, AC, Attack, AttackBonus, CR)
+// baseline for a given arena tier. arenaMonsterToTemplate then biases
+// HP/Attack by BaseLethality so within-tier ordering matches the legacy
+// difficulty curve.
+func arenaTierBaseStats(tier int) (hp, ac, atk, ab int, cr float32) {
+	switch tier {
+	case 1:
+		return 30, 13, 8, 4, 1
+	case 2:
+		return 80, 14, 14, 6, 4
+	case 3:
+		return 160, 15, 22, 7, 8
+	case 4:
+		return 260, 16, 32, 8, 13
+	case 5:
+		return 400, 18, 45, 10, 18
+	}
+	return 30, 13, 8, 4, 1
+}
+
+// arenaMonsterToTemplate maps a legacy ArenaMonster onto a
+// DnDMonsterTemplate. HP/AC/Attack scale with tier; within a tier,
+// BaseLethality biases the curve via a ±30% band so round-1 sits at
+// the bottom of the tier and round-4 at the top.
+func arenaMonsterToTemplate(id string, m ArenaMonster, tier int) DnDMonsterTemplate {
+	hp, ac, atk, ab, cr := arenaTierBaseStats(tier)
+	bias := (m.BaseLethality - 0.5) * 0.6 // ≈ -0.24 .. +0.29
+	hp = int(float64(hp) * (1 + bias))
+	atk = int(float64(atk) * (1 + bias))
+	if hp < 1 {
+		hp = 1
+	}
+	if atk < 1 {
+		atk = 1
+	}
+	return DnDMonsterTemplate{
+		ID: id, Name: m.Name, CR: cr,
+		HP: hp, AC: ac, Attack: atk, AttackBonus: ab, Speed: 12,
+		BlockRate: 0.05,
+		Ability:   m.Ability,
+		XPValue:   arenaTiers[tier-1].BattleXP * 4,
+		Notes:     m.Flavor,
+	}
+}
+
+func init() {
+	for ti, t := range arenaTiers {
+		tier := ti + 1
+		for ri, m := range t.Monsters {
+			id := arenaBossID(tier, ri+1)
+			arenaBosses[id] = arenaMonsterToTemplate(id, m, tier)
+		}
+	}
+}
+
 // ── Arena Death Flavor Text ─────────────────────────────────────────────────
 
 var arenaDeathMessages = []string{

internal/plugin/adventure_arena_render.go

@@ -8,18 +8,18 @@ import (
 
 // ── Arena Tier Menu ─────────────────────────────────────────────────────────
 
-func renderArenaStreakEntry(char *AdventureCharacter, stats *ArenaPersonalStats, tier *ArenaTier, firstMonster *ArenaMonster) string {
+func renderArenaStreakEntry(c *DnDCharacter, stats *ArenaPersonalStats, tier *ArenaTier, firstMonster *ArenaMonster) string {
 	var b strings.Builder
 	b.WriteString("⚔️ **THE ARENA**\n\n")
 	b.WriteString("The Arena is a streak. You start at Tier 1 and fight your way down.\n")
 	b.WriteString("After each tier, you have 30 seconds to bail or you auto-advance.\n")
 	b.WriteString("Death forfeits all accumulated rewards.\n\n")
 
-	b.WriteString(fmt.Sprintf("Combat Level: %d\n\n", char.CombatLevel))
+	b.WriteString(fmt.Sprintf("Level: %d\n\n", c.Level))
 
 	for i := range arenaTiers {
 		t := &arenaTiers[i]
-		eligible := char.CombatLevel >= t.MinLevel
+		eligible := c.Level >= t.MinLevel
 		icon := "🔒"
 		if eligible {
 			icon = "⬚"
@@ -91,7 +91,7 @@ func renderArenaDeath(tier *ArenaTier, round int, monster *ArenaMonster, lostEar
 
 // ── Status ──────────────────────────────────────────────────────────────────
 
-func renderArenaStatus(run *ArenaRun, char *AdventureCharacter) string {
+func renderArenaStatus(run *ArenaRun) string {
 	tier := arenaGetTier(run.Tier)
 	if tier == nil {
 		return "No active arena run."
@@ -171,9 +171,12 @@ type ArenaPersonalStats struct {
 	Tier5Completions int
 }
 
-func renderArenaPersonalStats(char *AdventureCharacter, stats *ArenaPersonalStats) string {
+// renderArenaPersonalStats renders the !arena stats DM. Wins/losses come
+// from player_meta post-Phase L2 step 5 (the caller is responsible for
+// loading them); displayName is sourced from the AdvCharacter.
+func renderArenaPersonalStats(displayName string, wins, losses int, stats *ArenaPersonalStats) string {
 	var b strings.Builder
-	b.WriteString(fmt.Sprintf("⚔️ **%s's Arena Stats**\n\n", char.DisplayName))
+	b.WriteString(fmt.Sprintf("⚔️ **%s's Arena Stats**\n\n", displayName))
 
 	if stats == nil || stats.TotalRuns == 0 {
 		b.WriteString("No arena runs yet. Type `!arena` to begin.")
@@ -194,7 +197,7 @@ func renderArenaPersonalStats(char *AdventureCharacter, stats *ArenaPersonalStat
 		b.WriteString(fmt.Sprintf("Tier 5 completions: %d\n", stats.Tier5Completions))
 	}
 
-	b.WriteString(fmt.Sprintf("\nArena W/L: %d/%d", char.ArenaWins, char.ArenaLosses))
+	b.WriteString(fmt.Sprintf("\nArena W/L: %d/%d", wins, losses))
 	return b.String()
 }
 

internal/plugin/adventure_arena_test.go

@@ -1,7 +1,6 @@
 package plugin
 
 import (
-	"math"
 	"strings"
 	"testing"
 	"time"
@@ -107,96 +106,6 @@ func TestArenaMinLevel_Increasing(t *testing.T) {
 	}
 }
 
-// ── Death Chance Formula Tests ──────────────────────────────────────────────
-
-func TestArenaDeathChance_Clamped(t *testing.T) {
-	// Min-level player with tier 0 gear vs easiest monster
-	char := &AdventureCharacter{CombatLevel: 1}
-	equip := map[EquipmentSlot]*AdvEquipment{
-		SlotWeapon: {Tier: 0}, SlotArmor: {Tier: 0}, SlotHelmet: {Tier: 0},
-		SlotBoots: {Tier: 0}, SlotTool: {Tier: 0},
-	}
-	monster := arenaGetMonster(1, 1)
-	dc := arenaDeathChance(monster, char, equip)
-	if dc < 0.01 || dc > 0.98 {
-		t.Errorf("death chance %f out of [0.01, 0.98] bounds", dc)
-	}
-}
-
-func TestArenaDeathChance_MaxGearReduces(t *testing.T) {
-	// Use a mid-tier monster where gear difference is visible above the floor
-	char := &AdventureCharacter{CombatLevel: 25}
-	monster := arenaGetMonster(3, 3) // Behemoth Adjacent (0.73 lethality)
-
-	noGear := map[EquipmentSlot]*AdvEquipment{
-		SlotWeapon: {Tier: 0}, SlotArmor: {Tier: 0}, SlotHelmet: {Tier: 0},
-		SlotBoots: {Tier: 0}, SlotTool: {Tier: 0},
-	}
-	maxGear := map[EquipmentSlot]*AdvEquipment{
-		SlotWeapon: {Tier: 5}, SlotArmor: {Tier: 5}, SlotHelmet: {Tier: 5},
-		SlotBoots: {Tier: 5}, SlotTool: {Tier: 5},
-	}
-
-	dcNoGear := arenaDeathChance(monster, char, noGear)
-	dcMaxGear := arenaDeathChance(monster, char, maxGear)
-
-	if dcMaxGear >= dcNoGear {
-		t.Errorf("max gear (%f) should reduce death chance vs no gear (%f)", dcMaxGear, dcNoGear)
-	}
-}
-
-func TestArenaDeathChance_HighLevelReduces(t *testing.T) {
-	equip := map[EquipmentSlot]*AdvEquipment{
-		SlotWeapon: {Tier: 3}, SlotArmor: {Tier: 3}, SlotHelmet: {Tier: 3},
-		SlotBoots: {Tier: 3}, SlotTool: {Tier: 3},
-	}
-	monster := arenaGetMonster(3, 4) // The Inevitable
-
-	lowLevel := &AdventureCharacter{CombatLevel: 25}
-	highLevel := &AdventureCharacter{CombatLevel: 50}
-
-	dcLow := arenaDeathChance(monster, lowLevel, equip)
-	dcHigh := arenaDeathChance(monster, highLevel, equip)
-
-	if dcHigh >= dcLow {
-		t.Errorf("high level (%f) should have lower death chance than low level (%f)", dcHigh, dcLow)
-	}
-}
-
-func TestArenaDeathChance_T5R4_AlwaysTerrifying(t *testing.T) {
-	// Even max-everything player faces high death at T5R4
-	char := &AdventureCharacter{CombatLevel: 50}
-	equip := map[EquipmentSlot]*AdvEquipment{
-		SlotWeapon: {Tier: 5}, SlotArmor: {Tier: 5}, SlotHelmet: {Tier: 5},
-		SlotBoots: {Tier: 5}, SlotTool: {Tier: 5},
-	}
-	monster := arenaGetMonster(5, 4) // That Which Has Always Been
-
-	dc := arenaDeathChance(monster, char, equip)
-	if dc < 0.30 {
-		t.Errorf("T5R4 death chance for max player (%f) should be >= 0.30", dc)
-	}
-	// Should hit the 0.98 ceiling
-	if dc > 0.98 {
-		t.Errorf("T5R4 death chance (%f) exceeds ceiling 0.98", dc)
-	}
-}
-
-func TestArenaDeathChance_Floor(t *testing.T) {
-	// Even with absurd stats, floor is 0.01
-	char := &AdventureCharacter{CombatLevel: 50}
-	equip := map[EquipmentSlot]*AdvEquipment{
-		SlotWeapon: {Tier: 5}, SlotArmor: {Tier: 5}, SlotHelmet: {Tier: 5},
-		SlotBoots: {Tier: 5}, SlotTool: {Tier: 5},
-	}
-	monster := &ArenaMonster{BaseLethality: 0.01, ThreatLevel: 1}
-
-	dc := arenaDeathChance(monster, char, equip)
-	if dc < 0.01 {
-		t.Errorf("death chance %f below floor 0.01", dc)
-	}
-}
-
 // ── Reward Formula Tests ────────────────────────────────────────────────────
 
 func TestArenaRoundReward(t *testing.T) {
@@ -243,38 +152,11 @@ func TestArenaRewardScaling(t *testing.T) {
 	}
 }
 
-// ── Death Chance Formula Component Tests ────────────────────────────────────
-
-func TestArenaDeathChance_Components(t *testing.T) {
-	// Verify formula components individually
-	// death_chance = base + level_mod - equip_mod + skill_mod
-
-	// Level 1, tier 0 gear, T1R1 monster (lethality=0.10, threat=2)
-	char := &AdventureCharacter{CombatLevel: 1}
-	equip := map[EquipmentSlot]*AdvEquipment{
-		SlotWeapon: {Tier: 0}, SlotArmor: {Tier: 0}, SlotHelmet: {Tier: 0},
-		SlotBoots: {Tier: 0}, SlotTool: {Tier: 0},
-	}
-	monster := &ArenaMonster{BaseLethality: 0.10, ThreatLevel: 2}
-
-	dc := arenaDeathChance(monster, char, equip)
-
-	// Manual calculation:
-	// base = 0.10
-	// level_mod = (2-1) * 0.015 = 0.015
-	// skill_mod = max(0, 0.25 - 1*0.008) = 0.242
-	// equip_mod = 0 * 0.03 = 0 (tier 0 gives no equipment bonus)
-	// death_chance = 0.10 + 0.015 - 0 + 0.242 = 0.357
-	expected := 0.10 + 0.015 + 0.242
-	if math.Abs(dc-expected) > 0.001 {
-		t.Errorf("T1R1 components: got %f, expected ~%f", dc, expected)
-	}
-}
-
 // ── Render Tests ────────────────────────────────────────────────────────────
 
 func TestRenderArenaStreakEntry(t *testing.T) {
-	char := &AdventureCharacter{CombatLevel: 30}
+	// Level 5 unlocks T1+T2 only (post-L2 brackets: 1/4/8/13/18); T3-T5 locked.
+	char := &DnDCharacter{Level: 5}
 	tier := arenaGetTier(1)
 	monster := arenaGetMonster(1, 1)
 
@@ -576,7 +458,7 @@ func TestArenaGearDropRates_Decreasing(t *testing.T) {
 // ── Render Tests (New/Updated) ─────────────────────────────────────────────
 
 func TestRenderArenaStreakEntry_ShowsMultipliers(t *testing.T) {
-	char := &AdventureCharacter{CombatLevel: 50}
+	char := &DnDCharacter{Level: 20}
 	tier := arenaGetTier(1)
 	monster := arenaGetMonster(1, 1)
 
@@ -603,15 +485,15 @@ func TestRenderArenaStreakEntry_ShowsMultipliers(t *testing.T) {
 }
 
 func TestRenderArenaStreakEntry_HighLevel_AllEligible(t *testing.T) {
-	// T5 requires level 70, so use level 70+ to unlock everything
-	char := &AdventureCharacter{CombatLevel: 70}
+	// T5 requires level 18 (post-L2 D&D scale); level 20 unlocks everything.
+	char := &DnDCharacter{Level: 20}
 	tier := arenaGetTier(1)
 	monster := arenaGetMonster(1, 1)
 
 	text := renderArenaStreakEntry(char, nil, tier, monster)
-	// Level 70 should make all tiers eligible (no 🔒)
+	// Level 20 (D&D cap) should make all tiers eligible (no 🔒)
 	if strings.Contains(text, "🔒") {
-		t.Error("level 70 should have all tiers eligible (no locked icons)")
+		t.Error("level 20 should have all tiers eligible (no locked icons)")
 	}
 }
 
@@ -641,9 +523,8 @@ func TestRenderArenaRoundStart_ZeroEarnings(t *testing.T) {
 
 func TestRenderArenaStatus_Active(t *testing.T) {
 	run := &ArenaRun{Tier: 2, Round: 3, Status: "active", Earnings: 8000, TierEarnings: 1500, RoundsSurvived: 6}
-	char := &AdventureCharacter{CombatLevel: 20}
 
-	text := renderArenaStatus(run, char)
+	text := renderArenaStatus(run)
 	if !strings.Contains(text, "Streak") {
 		t.Error("status should say Arena Streak")
 	}
@@ -660,9 +541,8 @@ func TestRenderArenaStatus_Active(t *testing.T) {
 
 func TestRenderArenaStatus_Awaiting(t *testing.T) {
 	run := &ArenaRun{Tier: 3, Status: "awaiting", Earnings: 20000, TierEarnings: 0, RoundsSurvived: 12}
-	char := &AdventureCharacter{CombatLevel: 30}
 
-	text := renderArenaStatus(run, char)
+	text := renderArenaStatus(run)
 	if !strings.Contains(text, "advancing shortly") {
 		t.Error("awaiting status should mention advancing")
 	}
@@ -730,20 +610,18 @@ func TestRenderArenaDeathReprieve(t *testing.T) {
 }
 
 func TestRenderArenaPersonalStats_NoStats(t *testing.T) {
-	char := &AdventureCharacter{DisplayName: "TestPlayer"}
-	text := renderArenaPersonalStats(char, nil)
+	text := renderArenaPersonalStats("TestPlayer", 0, 0, nil)
 	if !strings.Contains(text, "No arena runs") {
 		t.Error("empty stats should say no runs")
 	}
 }
 
 func TestRenderArenaPersonalStats_WithStats(t *testing.T) {
-	char := &AdventureCharacter{DisplayName: "Alice", ArenaWins: 8, ArenaLosses: 3}
 	stats := &ArenaPersonalStats{
 		TotalRuns: 11, TotalEarnings: 150000, TotalDeaths: 3,
 		HighestTier: 5, Tier5Completions: 2,
 	}
-	text := renderArenaPersonalStats(char, stats)
+	text := renderArenaPersonalStats("Alice", 8, 3, stats)
 	if !strings.Contains(text, "Alice") {
 		t.Error("stats should show player name")
 	}
@@ -784,20 +662,19 @@ func TestRenderArenaLeaderboard_WithEntries(t *testing.T) {
 
 func TestRenderArenaLevelGate(t *testing.T) {
 	tier := arenaGetTier(3)
-	text := renderArenaLevelGate(tier, 10)
-	if !strings.Contains(text, "Level 25") {
+	text := renderArenaLevelGate(tier, 5)
+	if !strings.Contains(text, "Level 8") {
 		t.Error("gate message should show required level")
 	}
-	if !strings.Contains(text, "Level 10") {
+	if !strings.Contains(text, "Level 5") {
 		t.Error("gate message should show player level")
 	}
 }
 
 func TestRenderArenaStatus(t *testing.T) {
 	run := &ArenaRun{Tier: 3, Round: 2, Status: "active", Earnings: 5000, RoundsSurvived: 5}
-	char := &AdventureCharacter{CombatLevel: 30}
 
-	text := renderArenaStatus(run, char)
+	text := renderArenaStatus(run)
 	if !strings.Contains(text, "Tier: 3") {
 		t.Error("status should show tier")
 	}
@@ -876,7 +753,7 @@ func TestArenaStreakSimulation_FullRun(t *testing.T) {
 		TierEarnings:  0,
 		XPAccumulated: 0,
 	}
-	combatLevel := 30
+	skillBonus := 20
 
 	for tierNum := 1; tierNum <= 5; tierNum++ {
 		tier := arenaGetTier(tierNum)
@@ -884,7 +761,7 @@ func TestArenaStreakSimulation_FullRun(t *testing.T) {
 
 		for round := 1; round <= 4; round++ {
 			run.Round = round
-			reward := arenaRoundReward(tier, round, combatLevel)
+			reward := arenaRoundReward(tier, round, skillBonus)
 			run.TierEarnings += reward
 			run.XPAccumulated += tier.BattleXP
 			run.RoundsSurvived++
@@ -914,7 +791,7 @@ func TestArenaStreakSimulation_FullRun(t *testing.T) {
 	for tierNum := 1; tierNum <= 5; tierNum++ {
 		tier := arenaGetTier(tierNum)
 		for round := 1; round <= 4; round++ {
-			rawTotal += arenaRoundReward(tier, round, combatLevel)
+			rawTotal += arenaRoundReward(tier, round, skillBonus)
 		}
 		rawTotal += tier.CompletionBonus
 	}
@@ -1056,7 +933,7 @@ func TestArenaStreakEuroMultiplier_Exact(t *testing.T) {
 // ── Streak Entry Shows Brim & Battle Sponsorship ──────────────────────────
 
 func TestArenaStreakEntry_Sponsorship(t *testing.T) {
-	char := &AdventureCharacter{CombatLevel: 1}
+	char := &DnDCharacter{Level: 1}
 	tier := arenaGetTier(1)
 	monster := arenaGetMonster(1, 1)
 

internal/plugin/adventure_babysit.go

@@ -3,7 +3,6 @@ package plugin
 import (
 	"fmt"
 	"log/slog"
-	"math/rand/v2"
 	"strings"
 	"time"
 
@@ -14,48 +13,71 @@ import (
 
 // ── Pricing ─────────────────────────────────────────────────────────────────
 
-func babysitDailyCost(combatLevel int) int {
-	return 100 + (combatLevel * 20)
+// babysitDailyCost returns the daily babysit subscription cost in €.
+// Phase L (post-L5g): keyed off D&D Level instead of legacy CombatLevel.
+// The slope is 5× the old per-level slope to preserve the curve shape across
+// the 5:1 compression in dndLevelFromCombatLevel — Level 4 (~old CL 20) =
+// €500/day, Level 10 (~old CL 50) = €1100/day, matching pre-migration pricing.
+func babysitDailyCost(level int) int {
+	return 100 + (level * 100)
 }
 
-// ── Weakest Skill ───────────────────────────────────────────────────────────
+// ── Pet-care daily trickle ─────────────────────────────────────────────────
 
-func babysitWeakestSkill(char *AdventureCharacter) string {
-	skills := []struct {
-		name  string
-		level int
-	}{
-		{"mining", char.MiningSkill},
-		{"fishing", char.FishingSkill},
-		{"foraging", char.ForagingSkill},
+// petXPPerBabysitDay is the daily pet XP awarded while a babysit subscription
+// is active. Picked to be a meaningful but not overwhelming push toward L10:
+// roughly equivalent to a couple of player-driven actions per day.
+const petXPPerBabysitDay = 3
+
+// runBabysitDailyTrickle grants daily pet XP while a babysit subscription is
+// active and logs an entry for the end-of-service summary. Caller is
+// responsible for saving the character afterwards.
+func (p *AdventurePlugin) runBabysitDailyTrickle(char *AdventureCharacter) {
+	if !char.BabysitActive {
+		return
 	}
-	minLevel := skills[0].level
-	for _, s := range skills[1:] {
-		if s.level < minLevel {
-			minLevel = s.level
+	leveled := false
+	if char.HasPet() && char.PetLevel < 10 {
+		// Bypass petGrantXP's per-action constant — we want a flat trickle.
+		char.PetXP += petXPPerBabysitDay * 100
+		for char.PetLevel < 10 {
+			needed := petXPToNextLevel(char.PetLevel) * 100
+			if char.PetXP < needed {
+				break
+			}
+			char.PetXP -= needed
+			char.PetLevel++
+			leveled = true
+		}
+		if char.PetLevel >= 10 && char.PetLevel10Date == "" {
+			char.PetLevel10Date = time.Now().UTC().Format("2006-01-02")
 		}
 	}
-	// Collect ties
-	var tied []string
-	for _, s := range skills {
-		if s.level == minLevel {
-			tied = append(tied, s.name)
-		}
+	outcome := "pet_care"
+	if leveled {
+		outcome = "pet_care_levelup"
 	}
-	return tied[rand.IntN(len(tied))]
+	logBabysitActivity(char.UserID, "pet_care", outcome, 0, petXPPerBabysitDay, "")
 }
 
-// skillToActivity maps a skill name to its activity type.
-func skillToActivity(skill string) AdvActivityType {
-	switch skill {
-	case "mining":
-		return AdvActivityMining
-	case "fishing":
-		return AdvActivityFishing
-	case "foraging":
-		return AdvActivityForaging
+// BabysitSafeRest reports whether the user has an active babysit subscription
+// that should let standard camps qualify for fortified-tier rest perks.
+// Returns false on any error (treat as no babysit). Safe to call from tests
+// where the global DB has not been initialized — the panic is swallowed.
+func BabysitSafeRest(userID id.UserID) (active bool) {
+	defer func() {
+		if r := recover(); r != nil {
+			active = false
+		}
+	}()
+	char, err := loadAdvCharacter(userID)
+	if err != nil || char == nil || !char.BabysitActive {
+		return false
 	}
-	return AdvActivityMining
+	if char.BabysitExpiresAt != nil && time.Now().UTC().After(*char.BabysitExpiresAt) {
+		return false
+	}
+	return true
 }
 
 // ── Command Handlers ────────────────────────────────────────────────────────
@@ -72,41 +94,19 @@ func (p *AdventurePlugin) handleBabysitCmd(ctx MessageContext, args string) erro
 		return p.handleBabysitPurchase(ctx, 7)
 	case lower == "month":
 		return p.handleBabysitPurchase(ctx, 30)
-	case lower == "auto":
-		return p.handleBabysitAutoToggle(ctx)
 	default:
 		return p.SendDM(ctx.Sender, "🍼 **Adventurer Babysitting Service**\n\n"+
+			"Hire a babysitter to look after your camp and tend the pet while you sleep:\n"+
+			"  • Daily pet XP trickle (your pet still grows while you focus elsewhere)\n"+
+			"  • Standard camps act like fortified ones — rest deeply, no need to have downed the zone boss\n"+
+			"  • Rival duels declined on your behalf\n\n"+
 			"`!adventure babysit week` — 7 days of service\n"+
 			"`!adventure babysit month` — 30 days of service\n"+
-			"`!adventure babysit auto` — toggle auto-babysit on missed days\n"+
 			"`!adventure babysit status` — check service status\n"+
 			"`!adventure babysit cancel` — cancel early (no refund)")
 	}
 }
 
-func (p *AdventurePlugin) handleBabysitAutoToggle(ctx MessageContext) error {
-	userMu := p.advUserLock(ctx.Sender)
-	userMu.Lock()
-	defer userMu.Unlock()
-
-	char, err := loadAdvCharacter(ctx.Sender)
-	if err != nil {
-		return p.SendDM(ctx.Sender, "No adventurer found. Type `!adventure` to create one.")
-	}
-
-	char.AutoBabysit = !char.AutoBabysit
-	if err := saveAdvCharacter(char); err != nil {
-		slog.Error("babysit: failed to save auto-babysit toggle", "user", ctx.Sender, "err", err)
-		return p.SendDM(ctx.Sender, "Something went wrong. Try again.")
-	}
-
-	daily := babysitDailyCost(char.CombatLevel)
-	if char.AutoBabysit {
-		return p.SendDM(ctx.Sender, fmt.Sprintf("🍼 **Auto-babysit: ON**\n\nIf you miss a day, the babysitter steps in automatically (€%d/day). Your streak stays alive. Disable anytime with `!adventure babysit auto`.", daily))
-	}
-	return p.SendDM(ctx.Sender, "🍼 **Auto-babysit: OFF**\n\nYou're on your own. Miss a day and your streak takes the hit.")
-}
-
 func (p *AdventurePlugin) handleBabysitPurchase(ctx MessageContext, days int) error {
 	userMu := p.advUserLock(ctx.Sender)
 	userMu.Lock()
@@ -125,34 +125,32 @@ func (p *AdventurePlugin) handleBabysitPurchase(ctx MessageContext, days int) er
 		return p.SendDM(ctx.Sender, "Your adventurer is dead. The babysitter does not work with corpses.")
 	}
 
-	daily := babysitDailyCost(char.CombatLevel)
+	daily := babysitDailyCost(dndLevelForUser(char.UserID))
 	totalCost := daily * days
 	balance := p.euro.GetBalance(char.UserID)
 	if balance < float64(totalCost) {
 		return p.SendDM(ctx.Sender, fmt.Sprintf("🍼 The babysitting service costs %s for %d days. You have %s. The service has standards. Not many, but some.", fmtEuro(totalCost), days, fmtEuro(balance)))
 	}
 
-	// Debit gold
 	if !p.euro.Debit(char.UserID, float64(totalCost), "babysit_purchase") {
 		return p.SendDM(ctx.Sender, "Payment failed. The babysitter looked at your wallet and walked away.")
 	}
 
-	// Clear any leftover logs from prior service so this period's summary is clean
 	clearBabysitLogs(char.UserID)
 
-	// Set babysit fields
-	skill := babysitWeakestSkill(char)
 	expires := time.Now().UTC().Add(time.Duration(days) * 24 * time.Hour)
 	char.BabysitActive = true
 	char.BabysitExpiresAt = &expires
-	char.BabysitSkillFocus = skill
+	char.BabysitSkillFocus = "" // legacy field; no longer used
 
 	if err := saveAdvCharacter(char); err != nil {
 		slog.Error("babysit: failed to save character", "user", char.UserID, "err", err)
-		// Refund
 		p.euro.Credit(char.UserID, float64(totalCost), "babysit_refund")
 		return p.SendDM(ctx.Sender, "Something went wrong activating the service. Your gold has been refunded.")
 	}
+	if err := upsertPlayerMetaBabysitState(char.UserID, babysitStateFromAdvChar(char)); err != nil {
+		slog.Error("player_meta: babysit start dual-write failed", "user", char.UserID, "err", err)
+	}
 
 	confirm := pickBabysitFlavor(babysitConfirmLines)
 	durLabel := "1 week"
@@ -160,13 +158,18 @@ func (p *AdventurePlugin) handleBabysitPurchase(ctx MessageContext, days int) er
 		durLabel = "1 month"
 	}
 
+	petLine := "No pet to tend yet — the babysitter will keep that in mind."
+	if char.HasPet() {
+		petLine = fmt.Sprintf("Pet: %s (L%d) — daily care included", char.PetName, char.PetLevel)
+	}
+
 	text := fmt.Sprintf("🍼 **Adventurer Babysitting Service — Activated**\n\n"+
 		"Duration: %s (%d days)\n"+
 		"Cost: €%d\n"+
-		"Focus: %s (currently level %d)\n"+
+		"%s\n"+
+		"Camp safety: standard camps now rest like fortified ones\n"+
 		"Rival duels: declined on your behalf\n\n"+
-		"Daily DMs are suspended until the service ends.\n\n"+
-		"_%s_", durLabel, days, totalCost, titleCase(skill), babysitSkillLevel(char, skill), confirm)
+		"_%s_", durLabel, days, totalCost, petLine, confirm)
 
 	return p.SendDM(ctx.Sender, text)
 }
@@ -177,13 +180,8 @@ func (p *AdventurePlugin) handleBabysitStatus(ctx MessageContext) error {
 		return p.SendDM(ctx.Sender, "No adventurer found.")
 	}
 
-	autoLabel := "OFF"
-	if char.AutoBabysit {
-		autoLabel = "ON"
-	}
-
 	if !char.BabysitActive {
-		return p.SendDM(ctx.Sender, fmt.Sprintf("🍼 No active babysitting service.\nAuto-babysit: **%s** (`!adventure babysit auto` to toggle)\n\nUse `!adventure babysit week` or `!adventure babysit month` to start.", autoLabel))
+		return p.SendDM(ctx.Sender, "🍼 No active babysitting service.\n\nUse `!adventure babysit week` or `!adventure babysit month` to start. The babysitter tends your pet daily and lets you rest deeply at standard camps.")
 	}
 
 	remaining := "unknown"
@@ -196,23 +194,24 @@ func (p *AdventurePlugin) handleBabysitStatus(ctx MessageContext) error {
 		}
 	}
 
-	// Load log stats
 	logs, err := loadBabysitLogs(char.UserID)
 	if err != nil {
 		slog.Error("babysit: failed to load logs", "user", char.UserID, "err", err)
 	}
-	totalGold, totalXP, itemsClaimed, rivalsRefused := babysitLogStats(logs)
+	totalXP, petDays, rivalsRefused := babysitLogStats(logs)
+
+	petLine := "No pet to tend"
+	if char.HasPet() {
+		petLine = fmt.Sprintf("%s (L%d)", char.PetName, char.PetLevel)
+	}
 
 	text := fmt.Sprintf("🍼 **Babysitting Service — Status**\n\n"+
 		"Time remaining: %s\n"+
-		"Skill focus: %s\n"+
-		"Days completed: %d\n"+
-		"Gold earned: €%d\n"+
-		"XP gained: %d\n"+
-		"Items claimed by babysitter: %d\n"+
-		"Rivals declined: %d\n"+
-		"Auto-babysit: %s",
-		remaining, titleCase(char.BabysitSkillFocus), len(logs), totalGold, totalXP, itemsClaimed, rivalsRefused, autoLabel)
+		"Pet under care: %s\n"+
+		"Days of pet care given: %d\n"+
+		"Pet XP trickled: %d\n"+
+		"Rivals declined: %d",
+		remaining, petLine, petDays, totalXP, rivalsRefused)
 
 	return p.SendDM(ctx.Sender, text)
 }
@@ -231,164 +230,25 @@ func (p *AdventurePlugin) handleBabysitCancel(ctx MessageContext) error {
 		return p.SendDM(ctx.Sender, "🍼 There's nothing to cancel. The babysitter isn't here.")
 	}
 
-	// Compile partial summary
 	logs, err := loadBabysitLogs(char.UserID)
 	if err != nil {
 		slog.Error("babysit: failed to load logs", "user", char.UserID, "err", err)
 	}
 	summary := renderBabysitSummary(char, logs)
 
-	// Clear babysit state
 	char.BabysitActive = false
 	char.BabysitExpiresAt = nil
 	char.BabysitSkillFocus = ""
 	if err := saveAdvCharacter(char); err != nil {
 		slog.Error("babysit: failed to save character on cancel", "user", char.UserID, "err", err)
 	}
+	if err := upsertPlayerMetaBabysitState(char.UserID, babysitStateFromAdvChar(char)); err != nil {
+		slog.Error("player_meta: babysit cancel dual-write failed", "user", char.UserID, "err", err)
+	}
 
 	return p.SendDM(ctx.Sender, "🍼 Service cancelled. No refund. The babysitter was already there.\n\n"+summary)
 }
 
-// ── Daily Auto-Resolution ───────────────────────────────────────────────────
-
-func (p *AdventurePlugin) runBabysitDaily(char *AdventureCharacter) {
-	equip, err := loadAdvEquipment(char.UserID)
-	if err != nil {
-		slog.Error("babysit: failed to load equipment", "user", char.UserID, "err", err)
-		return
-	}
-
-	isHol, _ := isHolidayToday()
-	harvestMax := maxHarvestActions
-	if isHol {
-		harvestMax++
-	}
-
-	bonuses := &AdvBonusSummary{}
-	focusActivity := skillToActivity(char.BabysitSkillFocus)
-
-	var totalGold int
-	var totalXP int
-	var allItems []string
-
-	// Use all harvest actions on the focused skill — no combat, too dangerous
-	for char.HarvestActionsUsed < harvestMax {
-		gold, xp, items := p.runBabysitAction(char, equip, focusActivity, bonuses)
-		totalGold += gold
-		totalXP += xp
-		allItems = append(allItems, items...)
-		char.HarvestActionsUsed++
-	}
-
-	char.ActionTakenToday = true
-	char.LastActionDate = time.Now().UTC().Format("2006-01-02")
-
-	if err := saveAdvCharacter(char); err != nil {
-		slog.Error("babysit: failed to save character after daily", "user", char.UserID, "err", err)
-	}
-
-	// Log combined daily totals
-	itemsJSON := ""
-	if len(allItems) > 0 {
-		itemsJSON = strings.Join(allItems, ", ")
-	}
-	logBabysitActivity(char.UserID, string(focusActivity), "babysit_daily",
-		totalGold, totalXP, itemsJSON)
-}
-
-// runBabysitAction resolves a single action for the babysitter. Returns gold, xp, item names.
-func (p *AdventurePlugin) runBabysitAction(char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, activity AdvActivityType, bonuses *AdvBonusSummary) (int, int, []string) {
-	eligible := advEligibleLocations(char, equip, activity, bonuses)
-	if len(eligible) == 0 {
-		return 0, 0, nil
-	}
-	loc := eligible[len(eligible)-1].Location
-	inPenalty := eligible[len(eligible)-1].InPenaltyZone
-
-	result := resolveAdvAction(char, equip, loc, bonuses, inPenalty)
-
-	// Babysitter never lets the adventurer die
-	if result.Outcome == AdvOutcomeDeath {
-		result.Outcome = AdvOutcomeEmpty
-		result.LootItems = nil
-		result.TotalLootValue = 0
-		result.EquipDamage = nil
-		result.EquipBroken = nil
-	}
-
-	// Double XP/money boost
-	advApplyBoost(result)
-
-	// Apply XP
-	switch result.XPSkill {
-	case "combat":
-		char.CombatXP += result.XPGained
-	case "mining":
-		char.MiningXP += result.XPGained
-	case "foraging":
-		char.ForagingXP += result.XPGained
-	case "fishing":
-		char.FishingXP += result.XPGained
-	}
-	checkAdvLevelUp(char, result.XPSkill)
-
-	// Credit gold
-	if result.TotalLootValue > 0 {
-		net, _ := communityTax(char.UserID, float64(result.TotalLootValue), 0.05)
-		p.euro.Credit(char.UserID, net, "babysit_haul")
-	}
-
-	// No treasure drops during babysitting
-	result.TreasureFound = nil
-
-	var items []string
-	for _, item := range result.LootItems {
-		items = append(items, item.Name)
-	}
-	return int(result.TotalLootValue), result.XPGained, items
-}
-
-// runAutoBabysitDay runs a single day of babysit actions for auto-babysit.
-// Called by the scheduler when a player with auto-babysit enabled misses a day.
-func (p *AdventurePlugin) runAutoBabysitDay(char *AdventureCharacter) {
-	equip, err := loadAdvEquipment(char.UserID)
-	if err != nil {
-		slog.Error("auto-babysit: failed to load equipment", "user", char.UserID, "err", err)
-		return
-	}
-
-	isHol, _ := isHolidayToday()
-	harvestMax := maxHarvestActions
-	if isHol {
-		harvestMax++
-	}
-
-	bonuses := &AdvBonusSummary{}
-	skill := babysitWeakestSkill(char)
-	activity := skillToActivity(skill)
-
-	var totalGold int
-	var totalXP int
-	var allItems []string
-	for char.HarvestActionsUsed < harvestMax {
-		gold, xp, items := p.runBabysitAction(char, equip, activity, bonuses)
-		totalGold += gold
-		totalXP += xp
-		allItems = append(allItems, items...)
-		char.HarvestActionsUsed++
-	}
-
-	char.ActionTakenToday = true
-	char.LastActionDate = time.Now().UTC().Format("2006-01-02")
-
-	itemsJSON := ""
-	if len(allItems) > 0 {
-		itemsJSON = strings.Join(allItems, ", ")
-	}
-	logBabysitActivity(char.UserID, string(activity), "auto_babysit_daily",
-		totalGold, totalXP, itemsJSON)
-}
-
 // ── Expiry Check ────────────────────────────────────────────────────────────
 
 func (p *AdventurePlugin) checkBabysitExpiry(chars []AdventureCharacter) {
@@ -401,7 +261,6 @@ func (p *AdventurePlugin) checkBabysitExpiry(chars []AdventureCharacter) {
 			continue
 		}
 
-		// Service expired — compile summary and send DM
 		logs, err := loadBabysitLogs(char.UserID)
 		if err != nil {
 			slog.Error("babysit: failed to load logs", "user", char.UserID, "err", err)
@@ -415,6 +274,9 @@ func (p *AdventurePlugin) checkBabysitExpiry(chars []AdventureCharacter) {
 			slog.Error("babysit: failed to save character on expiry", "user", char.UserID, "err", err)
 			continue
 		}
+		if err := upsertPlayerMetaBabysitState(char.UserID, babysitStateFromAdvChar(&char)); err != nil {
+			slog.Error("player_meta: babysit expiry dual-write failed", "user", char.UserID, "err", err)
+		}
 
 		if err := p.SendDM(char.UserID, summary); err != nil {
 			slog.Error("babysit: failed to send expiry summary DM", "user", char.UserID, "err", err)
@@ -425,20 +287,20 @@ func (p *AdventurePlugin) checkBabysitExpiry(chars []AdventureCharacter) {
 // ── Summary Rendering ───────────────────────────────────────────────────────
 
 func renderBabysitSummary(char *AdventureCharacter, logs []babysitLogEntry) string {
-	totalGold, totalXP, itemsClaimed, rivalsRefused := babysitLogStats(logs)
+	totalXP, petDays, rivalsRefused := babysitLogStats(logs)
 
 	var sb strings.Builder
 	sb.WriteString("🍼 **BABYSITTING SERVICE — END OF REPORT**\n\n")
-	sb.WriteString(fmt.Sprintf("Duration: %d days\n", len(logs)))
-	sb.WriteString(fmt.Sprintf("Tasks completed: %d\n", len(logs)))
-	sb.WriteString(fmt.Sprintf("Skill focused: %s\n", titleCase(char.BabysitSkillFocus)))
-	sb.WriteString(fmt.Sprintf("Gold earned from hauls: €%d\n", totalGold))
-	sb.WriteString(fmt.Sprintf("XP gained: %d\n", totalXP))
-	sb.WriteString(fmt.Sprintf("Items dropped: %d items. Claimed by the babysitter as per the terms.\n", itemsClaimed))
+	sb.WriteString(fmt.Sprintf("Days of service: %d\n", petDays))
+	if char.HasPet() {
+		sb.WriteString(fmt.Sprintf("Pet looked after: %s (L%d)\n", char.PetName, char.PetLevel))
+	} else {
+		sb.WriteString("Pet looked after: none — the babysitter played solitaire.\n")
+	}
+	sb.WriteString(fmt.Sprintf("Pet XP trickled: %d\n", totalXP))
 
 	if rivalsRefused > 0 {
 		sb.WriteString(fmt.Sprintf("\nRival challenges: %d declined\n", rivalsRefused))
-		// Pick a rival refusal flavor (generic — no specific rival name available)
 		for _, log := range logs {
 			if log.RivalRefused != "" {
 				line := pickBabysitFlavor(babysitRivalRefusalLines)
@@ -447,11 +309,8 @@ func renderBabysitSummary(char *AdventureCharacter, logs []babysitLogEntry) stri
 		}
 	}
 
-	// Diaper line
 	sb.WriteString("\n" + pickBabysitFlavor(babysitDiaperLines))
-
-	// Closing
-	sb.WriteString(fmt.Sprintf("\n\nYour adventurer is fed, rested, and slightly better at %s.", char.BabysitSkillFocus))
+	sb.WriteString("\n\nYour adventurer is fed and rested. The pet is suspiciously well-trained.")
 
 	return sb.String()
 }
@@ -519,27 +378,13 @@ func clearBabysitLogs(userID id.UserID) {
 	}
 }
 
-// ── Helpers ─────────────────────────────────────────────────────────────────
+// ── Stats helper ────────────────────────────────────────────────────────────
 
-func babysitSkillLevel(char *AdventureCharacter, skill string) int {
-	switch skill {
-	case "mining":
-		return char.MiningSkill
-	case "fishing":
-		return char.FishingSkill
-	case "foraging":
-		return char.ForagingSkill
-	}
-	return 0
-}
-
-func babysitLogStats(logs []babysitLogEntry) (totalGold, totalXP, itemsClaimed, rivalsRefused int) {
+func babysitLogStats(logs []babysitLogEntry) (totalXP, petDays, rivalsRefused int) {
 	for _, l := range logs {
-		totalGold += l.GoldEarned
 		totalXP += l.XPGained
-		if l.ItemsDropped != "" {
-			// Count comma-separated items
-			itemsClaimed += len(strings.Split(l.ItemsDropped, ", "))
+		if l.Activity == "pet_care" {
+			petDays++
 		}
 		if l.RivalRefused != "" {
 			rivalsRefused++

internal/plugin/adventure_babysit_test.go

@@ -0,0 +1,108 @@
+package plugin
+
+import (
+	"testing"
+	"time"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// L1: babysit pivot from harvest to pet-care + safe-rest.
+// These tests cover the pure pieces — DB-touching paths exercise via
+// integration only.
+
+func TestBabysitSafeRest_NoDB_ReturnsFalse(t *testing.T) {
+	// Tests run without db.Init(); BabysitSafeRest must recover and
+	// return false rather than panicking.
+	if BabysitSafeRest(id.UserID("@nodb:example")) {
+		t.Errorf("expected false for un-initialized DB")
+	}
+}
+
+func TestRunBabysitDailyTrickle_NoPetGrantsNothing(t *testing.T) {
+	// Without a pet, the trickle is a logging-only no-op for character
+	// state. Without DB, the log call panics inside db.Get; recover and
+	// assert that the in-memory char fields stay clean.
+	defer func() { _ = recover() }()
+
+	expires := time.Now().UTC().Add(7 * 24 * time.Hour)
+	char := &AdventureCharacter{
+		UserID:           id.UserID("@nopet:example"),
+		BabysitActive:    true,
+		BabysitExpiresAt: &expires,
+	}
+	p := &AdventurePlugin{}
+	p.runBabysitDailyTrickle(char)
+	if char.PetXP != 0 {
+		t.Errorf("char without pet should not gain PetXP, got %d", char.PetXP)
+	}
+	if char.PetLevel != 0 {
+		t.Errorf("char without pet should not change PetLevel, got %d", char.PetLevel)
+	}
+}
+
+func TestRunBabysitDailyTrickle_SkipsWhenInactive(t *testing.T) {
+	defer func() { _ = recover() }()
+	char := &AdventureCharacter{
+		UserID:        id.UserID("@inactive:example"),
+		BabysitActive: false,
+		PetType:       "dog",
+		PetName:       "Rex",
+		PetLevel:      1,
+		PetXP:         0,
+	}
+	p := &AdventurePlugin{}
+	p.runBabysitDailyTrickle(char)
+	if char.PetXP != 0 {
+		t.Errorf("inactive babysit should grant no XP, got %d", char.PetXP)
+	}
+}
+
+func TestRunBabysitDailyTrickle_AccumulatesAndLevels(t *testing.T) {
+	// Pet at L9 with 49 XP needed → 1 day at +3 trickle should *not* level
+	// (49→52 in centi-XP / 100 = no, wait: petXPToNextLevel at L9 = 50 ×
+	// 100 = 5000 centi-XP). Verify we accumulate centi-XP correctly across
+	// multiple daily ticks and eventually level up.
+	defer func() { _ = recover() }()
+
+	char := &AdventureCharacter{
+		UserID:   id.UserID("@accum:example"),
+		PetType:  "dog",
+		PetName:  "Rex",
+		PetLevel: 1, // needs 10 XP = 1000 centi-XP to L2
+		PetXP:    900,
+		BabysitActive: true,
+	}
+	expires := time.Now().UTC().Add(48 * time.Hour)
+	char.BabysitExpiresAt = &expires
+	p := &AdventurePlugin{}
+
+	// One trickle adds 3*100 = 300 centi-XP. 900 + 300 = 1200 >= 1000 →
+	// level to 2, carry 200 centi-XP.
+	p.runBabysitDailyTrickle(char)
+	if char.PetLevel != 2 {
+		t.Errorf("expected level 2 after trickle, got %d (xp=%d)", char.PetLevel, char.PetXP)
+	}
+	if char.PetXP != 200 {
+		t.Errorf("expected 200 carryover centi-XP, got %d", char.PetXP)
+	}
+}
+
+func TestBabysitLogStats_CountsPetCareDays(t *testing.T) {
+	logs := []babysitLogEntry{
+		{Activity: "pet_care", XPGained: 3},
+		{Activity: "pet_care", XPGained: 3},
+		{Activity: "pet_care", XPGained: 3, RivalRefused: ""},
+		{Activity: "rival_refused", RivalRefused: "Garth"},
+	}
+	xp, days, rivals := babysitLogStats(logs)
+	if days != 3 {
+		t.Errorf("petDays = %d, want 3", days)
+	}
+	if xp != 9 {
+		t.Errorf("totalXP = %d, want 9", xp)
+	}
+	if rivals != 1 {
+		t.Errorf("rivalsRefused = %d, want 1", rivals)
+	}
+}

internal/plugin/adventure_character.go

@@ -1,7 +1,6 @@
 package plugin
 
 import (
-	"database/sql"
 	"time"
 
 	"gogobee/internal/db"
@@ -94,8 +93,12 @@ type AdventureCharacter struct {
 	PetLevel10Date      string
 	PetMorningDefense   bool
 	AutoBabysit         bool
+	AutoBabysitFocus    string // mining|fishing|foraging — preferred skill for auto-babysit; "" defaults to weakest
+	TreasuresLocked     bool   // when true, treasure drops at cap are refused instead of auto-swapping
 	StreakDecayed        bool
 	CraftsSucceeded     int
+	DeathSource         string // "adventure" | "arena" | "" (legacy/unknown — treated as adventure)
+	DeathLocation       string // human-readable location of last death; cleared on revive is not required
 }
 
 type AdvEquipment struct {
@@ -249,12 +252,16 @@ func (c *AdventureCharacter) PardonAvailable() bool {
 	return time.Since(*c.LastPardonUsed) >= 168*time.Hour
 }
 
-// Kill marks the character as dead with a 6-hour respawn timer.
-func (c *AdventureCharacter) Kill() {
+// Kill marks the character as dead with a 6-hour respawn timer. source is
+// "adventure" or "arena"; location is a human-readable place name used by the
+// daily report and standout-loss flavor.
+func (c *AdventureCharacter) Kill(source, location string) {
 	c.Alive = false
 	deadUntil := time.Now().UTC().Add(6 * time.Hour)
 	c.DeadUntil = &deadUntil
 	c.LastDeathDate = time.Now().UTC().Format("2006-01-02")
+	c.DeathSource = source
+	c.DeathLocation = location
 }
 
 // HasPet returns true if the player has an active pet (not chased away).
@@ -304,7 +311,30 @@ func (c *AdventureCharacter) CanDoHarvest(isHoliday bool) bool {
 }
 
 func (c *AdventureCharacter) HasActedToday() bool {
-	return c.CombatActionsUsed > 0 || c.HarvestActionsUsed > 0
+	if c.CombatActionsUsed > 0 || c.HarvestActionsUsed > 0 {
+		return true
+	}
+	// DnD-side flows (expedition / zone / rest / autopilot) don't touch
+	// the legacy action counters; they credit the day via LastActionDate
+	// instead. Honor that so a player who ran an expedition all day and
+	// extracted before midnight still counts as having acted.
+	return c.LastActionDate == time.Now().UTC().Format("2006-01-02")
+}
+
+// markActedToday stamps the player's LastActionDate to today so the
+// midnight reset credits the day. Safe to call on every DnD-side action;
+// no-ops if the date is already today.
+func markActedToday(userID id.UserID) {
+	today := time.Now().UTC().Format("2006-01-02")
+	c, err := loadAdvCharacter(userID)
+	if err != nil || c == nil {
+		return
+	}
+	if c.LastActionDate == today {
+		return
+	}
+	c.LastActionDate = today
+	_ = saveAdvCharacter(c)
 }
 
 func (c *AdventureCharacter) AllActionsUsed(isHoliday bool) bool {
@@ -372,7 +402,17 @@ func xpToNextLevel(level int) int {
 
 // checkAdvLevelUp checks if a character leveled up in the given skill and applies it.
 // Returns whether a level-up occurred and the new level.
+//
+// Combat is special-cased: once a player has confirmed a D&D character,
+// combat_level freezes. dnd_level (driven by dnd_xp via grantDnDXP) is
+// canonical going forward. Combat XP still accrues into combat_xp for
+// historical display, but never causes combat_level to advance.
+// Skill levels (mining/foraging/fishing) are unaffected and continue to
+// progress on their own track per v1.1 §4.
 func checkAdvLevelUp(char *AdventureCharacter, skill string) (bool, int) {
+	if skill == "combat" && HasCompletedSetup(char.UserID) {
+		return false, char.CombatLevel
+	}
 	var xp *int
 	var level *int
 	switch skill {
@@ -413,111 +453,15 @@ func checkAdvLevelUp(char *AdventureCharacter, skill string) (bool, int) {
 
 func loadAdvCharacter(userID id.UserID) (*AdventureCharacter, error) {
 	d := db.Get()
-	c := &AdventureCharacter{}
-	var alive, actionTaken, holidayTaken, rivalUnlocked, babysitAct int
-	var deadUntil, reprieveLast, babysitExp, pardonUsed sql.NullTime
-	var mistyLastSeen, arinaLastSeen, mistyBuffExp, mistyDebuffExp, arinaBuffExp sql.NullTime
-
-	var houseFrozen, houseAutopay int
-	var petChasedAway, petReactivated, petArrived, thomAnimalLine, petSupplyUnlocked, petMorningDef int
-	var autoBabysit, streakDecayed int
-
-	err := d.QueryRow(`
-		SELECT user_id, display_name,
-		       combat_level, mining_skill, foraging_skill, fishing_skill,
-		       combat_xp, mining_xp, foraging_xp, fishing_xp,
-		       alive, dead_until, action_taken_today, holiday_action_taken,
-		       arena_wins, arena_losses, invasion_score, title,
-		       current_streak, best_streak, last_action_date, grudge_location,
-		       created_at, last_active_at, death_reprieve_last,
-		       masterwork_drops_received,
-		       rival_pool, rival_unlocked_notified,
-		       babysit_active, babysit_expires_at, babysit_skill_focus,
-		       hospital_visits, robbie_visit_count, last_death_date,
-		       combat_actions_used, harvest_actions_used,
-		       last_pardon_used,
-		       misty_last_seen, arina_last_seen,
-		       misty_buff_expires, misty_debuff_expires, arina_buff_expires,
-		       npc_msg_count, npc_msg_count_date,
-		       misty_roll_target, arina_roll_target,
-		       house_tier, house_loan_balance, house_loan_frozen, house_missed_payments,
-		       house_autopay, house_current_rate,
-		       pet_type, pet_name, pet_xp, pet_level, pet_armor_tier,
-		       pet_chased_away, pet_reactivated, pet_arrived,
-		       misty_encounter_count, misty_donated_count,
-		       thom_animal_line_fired, pet_supply_shop_unlocked, pet_level10_date,
-		       pet_morning_defense, auto_babysit, streak_decayed, crafts_succeeded
-		FROM adventure_characters WHERE user_id = ?`, string(userID)).Scan(
-		&c.UserID, &c.DisplayName,
-		&c.CombatLevel, &c.MiningSkill, &c.ForagingSkill, &c.FishingSkill,
-		&c.CombatXP, &c.MiningXP, &c.ForagingXP, &c.FishingXP,
-		&alive, &deadUntil, &actionTaken, &holidayTaken,
-		&c.ArenaWins, &c.ArenaLosses, &c.InvasionScore, &c.Title,
-		&c.CurrentStreak, &c.BestStreak, &c.LastActionDate, &c.GrudgeLocation,
-		&c.CreatedAt, &c.LastActiveAt, &reprieveLast,
-		&c.MasterworkDropsReceived,
-		&c.RivalPool, &rivalUnlocked,
-		&babysitAct, &babysitExp, &c.BabysitSkillFocus,
-		&c.HospitalVisits, &c.RobbieVisitCount, &c.LastDeathDate,
-		&c.CombatActionsUsed, &c.HarvestActionsUsed,
-		&pardonUsed,
-		&mistyLastSeen, &arinaLastSeen,
-		&mistyBuffExp, &mistyDebuffExp, &arinaBuffExp,
-		&c.NPCMsgCount, &c.NPCMsgCountDate,
-		&c.MistyRollTarget, &c.ArinaRollTarget,
-		&c.HouseTier, &c.HouseLoanBalance, &houseFrozen, &c.HouseMissedPayments,
-		&houseAutopay, &c.HouseCurrentRate,
-		&c.PetType, &c.PetName, &c.PetXP, &c.PetLevel, &c.PetArmorTier,
-		&petChasedAway, &petReactivated, &petArrived,
-		&c.MistyEncounterCount, &c.MistyDonatedCount,
-		&thomAnimalLine, &petSupplyUnlocked, &c.PetLevel10Date,
-		&petMorningDef, &autoBabysit, &streakDecayed, &c.CraftsSucceeded,
-	)
-	if err != nil {
+	var uid string
+	if err := d.QueryRow(
+		`SELECT user_id FROM player_meta WHERE user_id = ?`,
+		string(userID),
+	).Scan(&uid); err != nil {
 		return nil, err
 	}
-	c.Alive = alive == 1
-	c.ActionTakenToday = actionTaken == 1
-	c.HolidayActionTaken = holidayTaken == 1
-	c.RivalUnlockedNotified = rivalUnlocked == 1
-	c.BabysitActive = babysitAct == 1
-	c.PetMorningDefense = petMorningDef == 1
-	c.AutoBabysit = autoBabysit == 1
-	c.StreakDecayed = streakDecayed == 1
-	if deadUntil.Valid {
-		c.DeadUntil = &deadUntil.Time
-	}
-	if reprieveLast.Valid {
-		c.DeathReprieveLast = &reprieveLast.Time
-	}
-	if babysitExp.Valid {
-		c.BabysitExpiresAt = &babysitExp.Time
-	}
-	if pardonUsed.Valid {
-		c.LastPardonUsed = &pardonUsed.Time
-	}
-	if mistyLastSeen.Valid {
-		c.MistyLastSeen = &mistyLastSeen.Time
-	}
-	if arinaLastSeen.Valid {
-		c.ArinaLastSeen = &arinaLastSeen.Time
-	}
-	if mistyBuffExp.Valid {
-		c.MistyBuffExpires = &mistyBuffExp.Time
-	}
-	if mistyDebuffExp.Valid {
-		c.MistyDebuffExpires = &mistyDebuffExp.Time
-	}
-	if arinaBuffExp.Valid {
-		c.ArinaBuffExpires = &arinaBuffExp.Time
-	}
-	c.HouseLoanFrozen = houseFrozen == 1
-	c.HouseAutopay = houseAutopay == 1
-	c.PetChasedAway = petChasedAway == 1
-	c.PetReactivated = petReactivated == 1
-	c.PetArrived = petArrived == 1
-	c.ThomAnimalLineFired = thomAnimalLine == 1
-	c.PetSupplyShopUnlocked = petSupplyUnlocked == 1
+	c := &AdventureCharacter{UserID: id.UserID(uid), Alive: true}
+	applyPlayerMetaOverlay(c)
 	return c, nil
 }
 
@@ -529,10 +473,15 @@ func createAdvCharacter(userID id.UserID, displayName string) error {
 	}
 	defer tx.Rollback()
 
-	_, err = tx.Exec(`
-		INSERT INTO adventure_characters (user_id, display_name)
-		VALUES (?, ?)`, string(userID), displayName)
-	if err != nil {
+	// Adv 2.0 Phase L5 close-out: player_meta is the canonical seed row.
+	// adventure_characters is no longer written; loadAdvCharacter sources
+	// the user_id from player_meta and overlays every subsystem's state.
+	if _, err = tx.Exec(
+		`INSERT INTO player_meta (user_id, display_name, created_at, last_active_at, alive)
+		 VALUES (?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 1)
+		 ON CONFLICT(user_id) DO UPDATE SET display_name = excluded.display_name`,
+		string(userID), displayName,
+	); err != nil {
 		return err
 	}
 
@@ -550,126 +499,22 @@ func createAdvCharacter(userID id.UserID, displayName string) error {
 	return tx.Commit()
 }
 
+// saveAdvCharacter persists every mutable AdventureCharacter field to
+// player_meta. Phase L5h: the legacy adventure_characters UPDATE has been
+// retired — the row is now read-only after createAdvCharacter seeds it,
+// and saveAdvCharacter routes the entire mutable state set through the
+// per-subsystem player_meta upserts. LastActiveAt is auto-bumped to mirror
+// the previous CURRENT_TIMESTAMP semantics on save.
 func saveAdvCharacter(char *AdventureCharacter) error {
-	d := db.Get()
-	alive := 0
-	if char.Alive {
-		alive = 1
-	}
-	actionTaken := 0
-	if char.ActionTakenToday {
-		actionTaken = 1
-	}
-	holidayTaken := 0
-	if char.HolidayActionTaken {
-		holidayTaken = 1
-	}
-	rivalUnlocked := 0
-	if char.RivalUnlockedNotified {
-		rivalUnlocked = 1
-	}
-	babysitAct := 0
-	if char.BabysitActive {
-		babysitAct = 1
-	}
-	houseFrozen := 0
-	if char.HouseLoanFrozen {
-		houseFrozen = 1
-	}
-	houseAutopay := 0
-	if char.HouseAutopay {
-		houseAutopay = 1
-	}
-	petChasedAway := 0
-	if char.PetChasedAway {
-		petChasedAway = 1
-	}
-	petReactivated := 0
-	if char.PetReactivated {
-		petReactivated = 1
-	}
-	petArrived := 0
-	if char.PetArrived {
-		petArrived = 1
-	}
-	thomAnimalLine := 0
-	if char.ThomAnimalLineFired {
-		thomAnimalLine = 1
-	}
-	petSupplyUnlocked := 0
-	if char.PetSupplyShopUnlocked {
-		petSupplyUnlocked = 1
-	}
-	petMorningDef := 0
-	if char.PetMorningDefense {
-		petMorningDef = 1
-	}
-	autoBabysit := 0
-	if char.AutoBabysit {
-		autoBabysit = 1
-	}
-	streakDecayed := 0
-	if char.StreakDecayed {
-		streakDecayed = 1
-	}
+	char.LastActiveAt = time.Now().UTC()
+	return upsertAllPlayerMetaFromAdvChar(char)
+}
 
-	_, err := d.Exec(`
-		UPDATE adventure_characters SET
-			display_name = ?, combat_level = ?, mining_skill = ?, foraging_skill = ?, fishing_skill = ?,
-			combat_xp = ?, mining_xp = ?, foraging_xp = ?, fishing_xp = ?,
-			alive = ?, dead_until = ?, action_taken_today = ?, holiday_action_taken = ?,
-			arena_wins = ?, arena_losses = ?, invasion_score = ?, title = ?,
-			current_streak = ?, best_streak = ?, last_action_date = ?, grudge_location = ?,
-			last_active_at = CURRENT_TIMESTAMP, death_reprieve_last = ?,
-			masterwork_drops_received = ?,
-			rival_pool = ?, rival_unlocked_notified = ?,
-			babysit_active = ?, babysit_expires_at = ?, babysit_skill_focus = ?,
-			hospital_visits = ?, robbie_visit_count = ?, last_death_date = ?,
-			combat_actions_used = ?, harvest_actions_used = ?,
-			last_pardon_used = ?,
-			misty_last_seen = ?, arina_last_seen = ?,
-			misty_buff_expires = ?, misty_debuff_expires = ?, arina_buff_expires = ?,
-			npc_msg_count = ?, npc_msg_count_date = ?,
-			misty_roll_target = ?, arina_roll_target = ?,
-			house_tier = ?, house_loan_balance = ?, house_loan_frozen = ?, house_missed_payments = ?,
-			house_autopay = ?, house_current_rate = ?,
-			pet_type = ?, pet_name = ?, pet_xp = ?, pet_level = ?, pet_armor_tier = ?,
-			pet_chased_away = ?, pet_reactivated = ?, pet_arrived = ?,
-			misty_encounter_count = ?, misty_donated_count = ?,
-			thom_animal_line_fired = ?, pet_supply_shop_unlocked = ?, pet_level10_date = ?,
-			pet_morning_defense = ?,
-			auto_babysit = ?,
-			streak_decayed = ?,
-			crafts_succeeded = ?
-		WHERE user_id = ?`,
-		char.DisplayName, char.CombatLevel, char.MiningSkill, char.ForagingSkill, char.FishingSkill,
-		char.CombatXP, char.MiningXP, char.ForagingXP, char.FishingXP,
-		alive, char.DeadUntil, actionTaken, holidayTaken,
-		char.ArenaWins, char.ArenaLosses, char.InvasionScore, char.Title,
-		char.CurrentStreak, char.BestStreak, char.LastActionDate, char.GrudgeLocation,
-		char.DeathReprieveLast, char.MasterworkDropsReceived,
-		char.RivalPool, rivalUnlocked,
-		babysitAct, char.BabysitExpiresAt, char.BabysitSkillFocus,
-		char.HospitalVisits, char.RobbieVisitCount, char.LastDeathDate,
-		char.CombatActionsUsed, char.HarvestActionsUsed,
-		char.LastPardonUsed,
-		char.MistyLastSeen, char.ArinaLastSeen,
-		char.MistyBuffExpires, char.MistyDebuffExpires, char.ArinaBuffExpires,
-		char.NPCMsgCount, char.NPCMsgCountDate,
-		char.MistyRollTarget, char.ArinaRollTarget,
-		char.HouseTier, char.HouseLoanBalance, houseFrozen, char.HouseMissedPayments,
-		houseAutopay, char.HouseCurrentRate,
-		char.PetType, char.PetName, char.PetXP, char.PetLevel, char.PetArmorTier,
-		petChasedAway, petReactivated, petArrived,
-		char.MistyEncounterCount, char.MistyDonatedCount,
-		thomAnimalLine, petSupplyUnlocked, char.PetLevel10Date,
-		petMorningDef,
-		autoBabysit,
-		streakDecayed,
-		char.CraftsSucceeded,
-		string(char.UserID),
-	)
-	return err
+func boolToInt(b bool) int {
+	if b {
+		return 1
+	}
+	return 0
 }
 
 func loadAdvEquipment(userID id.UserID) (map[EquipmentSlot]*AdvEquipment, error) {
@@ -773,128 +618,31 @@ func advInventoryCount(userID id.UserID) int {
 
 func loadAllAdvCharacters() ([]AdventureCharacter, error) {
 	d := db.Get()
-	rows, err := d.Query(`
-		SELECT user_id, display_name,
-		       combat_level, mining_skill, foraging_skill, fishing_skill,
-		       combat_xp, mining_xp, foraging_xp, fishing_xp,
-		       alive, dead_until, action_taken_today, holiday_action_taken,
-		       arena_wins, arena_losses, invasion_score, title,
-		       current_streak, best_streak, last_action_date, grudge_location,
-		       created_at, last_active_at, death_reprieve_last,
-		       masterwork_drops_received,
-		       rival_pool, rival_unlocked_notified,
-		       babysit_active, babysit_expires_at, babysit_skill_focus,
-		       hospital_visits, robbie_visit_count, last_death_date,
-		       combat_actions_used, harvest_actions_used,
-		       last_pardon_used,
-		       misty_last_seen, arina_last_seen,
-		       misty_buff_expires, misty_debuff_expires, arina_buff_expires,
-		       npc_msg_count, npc_msg_count_date,
-		       misty_roll_target, arina_roll_target,
-		       house_tier, house_loan_balance, house_loan_frozen, house_missed_payments,
-		       house_autopay, house_current_rate,
-		       pet_type, pet_name, pet_xp, pet_level, pet_armor_tier,
-		       pet_chased_away, pet_reactivated, pet_arrived,
-		       misty_encounter_count, misty_donated_count,
-		       thom_animal_line_fired, pet_supply_shop_unlocked, pet_level10_date,
-		       pet_morning_defense, auto_babysit, streak_decayed, crafts_succeeded
-		FROM adventure_characters`)
+	rows, err := d.Query(`SELECT user_id FROM player_meta`)
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-
-	var chars []AdventureCharacter
+	var uids []string
 	for rows.Next() {
-		c := AdventureCharacter{}
-		var alive, actionTaken, holidayTaken, rivalUnlocked, babysitAct int
-		var deadUntil, reprieveLast, babysitExp, pardonUsed sql.NullTime
-		var mistyLastSeen, arinaLastSeen, mistyBuffExp, mistyDebuffExp, arinaBuffExp sql.NullTime
-		var houseFrozen, houseAutopay int
-		var petChasedAway, petReactivated, petArrived, thomAnimalLine, petSupplyUnlocked, petMorningDef int
-		var autoBabysit, streakDecayed int
-		if err := rows.Scan(
-			&c.UserID, &c.DisplayName,
-			&c.CombatLevel, &c.MiningSkill, &c.ForagingSkill, &c.FishingSkill,
-			&c.CombatXP, &c.MiningXP, &c.ForagingXP, &c.FishingXP,
-			&alive, &deadUntil, &actionTaken, &holidayTaken,
-			&c.ArenaWins, &c.ArenaLosses, &c.InvasionScore, &c.Title,
-			&c.CurrentStreak, &c.BestStreak, &c.LastActionDate, &c.GrudgeLocation,
-			&c.CreatedAt, &c.LastActiveAt, &reprieveLast,
-			&c.MasterworkDropsReceived,
-			&c.RivalPool, &rivalUnlocked,
-			&babysitAct, &babysitExp, &c.BabysitSkillFocus,
-			&c.HospitalVisits, &c.RobbieVisitCount, &c.LastDeathDate,
-			&c.CombatActionsUsed, &c.HarvestActionsUsed,
-			&pardonUsed,
-			&mistyLastSeen, &arinaLastSeen,
-			&mistyBuffExp, &mistyDebuffExp, &arinaBuffExp,
-			&c.NPCMsgCount, &c.NPCMsgCountDate,
-			&c.MistyRollTarget, &c.ArinaRollTarget,
-			&c.HouseTier, &c.HouseLoanBalance, &houseFrozen, &c.HouseMissedPayments,
-			&houseAutopay, &c.HouseCurrentRate,
-			&c.PetType, &c.PetName, &c.PetXP, &c.PetLevel, &c.PetArmorTier,
-			&petChasedAway, &petReactivated, &petArrived,
-			&c.MistyEncounterCount, &c.MistyDonatedCount,
-			&thomAnimalLine, &petSupplyUnlocked, &c.PetLevel10Date,
-			&petMorningDef, &autoBabysit, &streakDecayed, &c.CraftsSucceeded,
-		); err != nil {
+		var uid string
+		if err := rows.Scan(&uid); err != nil {
+			rows.Close()
 			return nil, err
 		}
-		c.Alive = alive == 1
-		c.ActionTakenToday = actionTaken == 1
-		c.HolidayActionTaken = holidayTaken == 1
-		c.RivalUnlockedNotified = rivalUnlocked == 1
-		c.BabysitActive = babysitAct == 1
-		c.PetMorningDefense = petMorningDef == 1
-		c.AutoBabysit = autoBabysit == 1
-		c.StreakDecayed = streakDecayed == 1
-		c.HouseLoanFrozen = houseFrozen == 1
-		c.HouseAutopay = houseAutopay == 1
-		c.PetChasedAway = petChasedAway == 1
-		c.PetReactivated = petReactivated == 1
-		c.PetArrived = petArrived == 1
-		c.ThomAnimalLineFired = thomAnimalLine == 1
-		c.PetSupplyShopUnlocked = petSupplyUnlocked == 1
-		if deadUntil.Valid {
-			c.DeadUntil = &deadUntil.Time
-		}
-		if reprieveLast.Valid {
-			c.DeathReprieveLast = &reprieveLast.Time
-		}
-		if babysitExp.Valid {
-			c.BabysitExpiresAt = &babysitExp.Time
-		}
-		if pardonUsed.Valid {
-			c.LastPardonUsed = &pardonUsed.Time
-		}
-		if mistyLastSeen.Valid {
-			c.MistyLastSeen = &mistyLastSeen.Time
-		}
-		if arinaLastSeen.Valid {
-			c.ArinaLastSeen = &arinaLastSeen.Time
-		}
-		if mistyBuffExp.Valid {
-			c.MistyBuffExpires = &mistyBuffExp.Time
-		}
-		if mistyDebuffExp.Valid {
-			c.MistyDebuffExpires = &mistyDebuffExp.Time
-		}
-		if arinaBuffExp.Valid {
-			c.ArinaBuffExpires = &arinaBuffExp.Time
-		}
+		uids = append(uids, uid)
+	}
+	rows.Close()
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	chars := make([]AdventureCharacter, 0, len(uids))
+	for _, uid := range uids {
+		c := AdventureCharacter{UserID: id.UserID(uid), Alive: true}
+		applyPlayerMetaOverlay(&c)
 		chars = append(chars, c)
 	}
-	return chars, rows.Err()
-}
-
-func resetAllAdvDailyActions() error {
-	d := db.Get()
-	// Only reset actions taken before today — protects against race if a player
-	// resolves their action at exactly midnight.
-	today := time.Now().UTC().Format("2006-01-02")
-	_, err := d.Exec(`UPDATE adventure_characters SET action_taken_today = 0, holiday_action_taken = 0, combat_actions_used = 0, harvest_actions_used = 0, pet_morning_defense = 0 WHERE last_action_date < ? OR last_action_date IS NULL`, today)
-	return err
+	return chars, nil
 }
 
 func logAdvActivity(userID id.UserID, activityType, location, outcome string, lootValue int64, xpGained int, flavorKey string) {

internal/plugin/adventure_consumables.go

@@ -65,14 +65,17 @@ var consumableDefs = []ConsumableDef{
 	{Name: "Voidstone Shard", Effect: EffectReflect, Value: 0.50, Tier: 5, Buyable: false, Slot: "defensive"},
 }
 
-// consumableDefByName returns the definition for a consumable by name.
+// consumableDefByName returns the definition for a consumable by name. Falls
+// through to the magic-item registry so SRD potions/scrolls picked up as loot
+// or bought from Luigi's Curios shelf resolve in combat without being added
+// to the hardcoded consumableDefs table (see magic_items_gameplay.go).
 func consumableDefByName(name string) *ConsumableDef {
 	for i := range consumableDefs {
 		if consumableDefs[i].Name == name {
 			return &consumableDefs[i]
 		}
 	}
-	return nil
+	return magicItemConsumableDefByName(name)
 }
 
 // ── Threat Assessment ────────────────────────────────────────────────────────
@@ -86,17 +89,31 @@ const (
 	threatDangerous                      // > 1.0
 )
 
+// assessThreat estimates rounds-to-kill in both directions using the same
+// penetration model as the combat engine, then bands the threat by the ratio
+// of player-RTK to enemy-RTK. Old additive HP+Attack model ignored Defense and
+// rated even fights as "trivial" — players died after consumables were skipped.
 func assessThreat(player, enemy CombatStats) threatLevel {
-	playerPower := float64(player.MaxHP + player.Attack*3)
-	enemyPower := float64(enemy.MaxHP + enemy.Attack*3)
-	if playerPower == 0 {
+	const K = 40.0
+	dprPlayer := float64(player.Attack) * (K / (K + float64(enemy.Defense)))
+	dprEnemy := float64(enemy.Attack) * (K / (K + float64(player.Defense)))
+	if dprPlayer < 1 {
+		dprPlayer = 1
+	}
+	if dprEnemy < 1 {
+		dprEnemy = 1
+	}
+	rtkEnemy := float64(enemy.MaxHP) / dprPlayer  // rounds for player to kill enemy
+	rtkPlayer := float64(player.MaxHP) / dprEnemy // rounds for enemy to kill player
+	if rtkPlayer <= 0 {
 		return threatDangerous
 	}
-	ratio := enemyPower / playerPower
+	// ratio < 1: player wins the race (lower = more dominant). >1: enemy wins.
+	ratio := rtkEnemy / rtkPlayer
 	switch {
-	case ratio < 0.4:
+	case ratio < 0.35:
 		return threatTrivial
-	case ratio < 0.7:
+	case ratio < 0.65:
 		return threatEasy
 	case ratio < 1.0:
 		return threatCompetitive
@@ -108,26 +125,28 @@ func assessThreat(player, enemy CombatStats) threatLevel {
 // ── Selection Logic ──────────────────────────────────────────────────────────
 
 // SelectConsumables picks up to 2 items (1 offensive + 1 defensive) from inventory.
-// contentTier caps consumable tier to the content being fought (0 = no cap).
-func SelectConsumables(inventory []ConsumableItem, playerStats, enemyStats CombatStats, arenaRound int, contentTier int) []ConsumableItem {
+// contentTier is retained on the signature for callers but no longer caps
+// what gets considered — if it's in your bag, the picker can use it.
+// allowSkipTrivial=true lets the picker bail out of obvious wins to save
+// items — appropriate for dungeon dives full of chump rooms, but wrong for
+// arena/zone elite/boss encounters where the legacy threat assessor
+// underestimates d20-mode lethality (one bad nat-20 streak ends the run).
+//
+// Resource-saving still happens via betterOffensive/betterDefensive, which
+// prefer lower-tier items on non-Dangerous threats. Players with mixed
+// inventories don't burn a Voidstone Shard on a goblin; players with only
+// high-tier items now actually get to use them.
+func SelectConsumables(inventory []ConsumableItem, playerStats, enemyStats CombatStats, arenaRound int, contentTier int, allowSkipTrivial bool) []ConsumableItem {
+	_ = contentTier // retained for caller compatibility
 	threat := assessThreat(playerStats, enemyStats)
-	if threat == threatTrivial {
+	if threat == threatTrivial && allowSkipTrivial && arenaRound == 0 {
 		return nil
 	}
 
-	maxTier := maxConsumableTier(threat, arenaRound)
-	if contentTier > 0 && contentTier < maxTier {
-		maxTier = contentTier
-	}
-
 	var bestOffensive, bestDefensive *ConsumableItem
 
 	for i := range inventory {
 		item := &inventory[i]
-		if item.Def.Tier > maxTier {
-			continue
-		}
-
 		switch item.Def.Slot {
 		case "offensive":
 			if bestOffensive == nil || betterOffensive(item, bestOffensive, threat) {
@@ -150,23 +169,6 @@ func SelectConsumables(inventory []ConsumableItem, playerStats, enemyStats Comba
 	return selected
 }
 
-func maxConsumableTier(threat threatLevel, arenaRound int) int {
-	base := 1
-	switch threat {
-	case threatEasy:
-		base = 2
-	case threatCompetitive:
-		base = 3
-	case threatDangerous:
-		base = 5
-	}
-	// Arena: spend freely on later rounds
-	if arenaRound >= 3 {
-		base = min(5, base+1)
-	}
-	return base
-}
-
 // betterOffensive prefers lowest tier that's appropriate for the threat.
 func betterOffensive(candidate, current *ConsumableItem, threat threatLevel) bool {
 	if threat == threatDangerous {

internal/plugin/adventure_consumables_test.go

@@ -19,7 +19,7 @@ func TestSelectConsumables_TrivialFightSkips(t *testing.T) {
 	weak := CombatStats{MaxHP: 30, Attack: 5}
 	inv := makeInventory("Berry Poultice", "Coal Bomb")
 
-	selected := SelectConsumables(inv, strong, weak, 0, 0)
+	selected := SelectConsumables(inv, strong, weak, 0, 0, true)
 	if len(selected) != 0 {
 		t.Errorf("should skip consumables for trivial fight, got %d", len(selected))
 	}
@@ -30,7 +30,7 @@ func TestSelectConsumables_DangerousUsesHighTier(t *testing.T) {
 	strong := CombatStats{MaxHP: 200, Attack: 50}
 	inv := makeInventory("Berry Poultice", "Spirit Tonic", "Coal Bomb", "Ancient Artifact Oil")
 
-	selected := SelectConsumables(inv, weak, strong, 0, 0)
+	selected := SelectConsumables(inv, weak, strong, 0, 0, true)
 	if len(selected) != 2 {
 		t.Fatalf("expected 2 consumables, got %d", len(selected))
 	}
@@ -60,7 +60,7 @@ func TestSelectConsumables_MaxTwo(t *testing.T) {
 		"Coal Bomb", "Goblin Grease", "Blooper Ink Vial",
 	)
 
-	selected := SelectConsumables(inv, player, enemy, 0, 0)
+	selected := SelectConsumables(inv, player, enemy, 0, 0, true)
 	if len(selected) > 2 {
 		t.Errorf("max 2 consumables, got %d", len(selected))
 	}
@@ -87,7 +87,7 @@ func TestSelectConsumables_EasyUsesLowTier(t *testing.T) {
 
 	inv := makeInventory("Berry Poultice", "Spirit Tonic", "Coal Bomb", "Ancient Artifact Oil")
 
-	selected := SelectConsumables(inv, player, enemy, 0, 0)
+	selected := SelectConsumables(inv, player, enemy, 0, 0, true)
 	for _, s := range selected {
 		if s.Def.Tier > 2 {
 			t.Errorf("easy fight should use T1-T2, got %s (T%d)", s.Def.Name, s.Def.Tier)
@@ -101,8 +101,8 @@ func TestSelectConsumables_ArenaRoundEscalation(t *testing.T) {
 
 	inv := makeInventory("Berry Poultice", "Spirit Tonic", "Coal Bomb", "Sapphire Elixir")
 
-	r1 := SelectConsumables(inv, player, enemy, 1, 0)
-	r4 := SelectConsumables(inv, player, enemy, 4, 0)
+	r1 := SelectConsumables(inv, player, enemy, 1, 0, true)
+	r4 := SelectConsumables(inv, player, enemy, 4, 0, true)
 
 	maxTierR1 := 0
 	for _, s := range r1 {

internal/plugin/adventure_events.go

@@ -41,61 +41,69 @@ func (p *AdventurePlugin) eventTicker() {
 	ticker := time.NewTicker(1 * time.Minute)
 	defer ticker.Stop()
 
-	for range ticker.C {
-		now := time.Now().UTC()
-		dateKey := now.Format("2006-01-02")
-		currentMinute := now.Hour()*60 + now.Minute()
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			now := time.Now().UTC()
+			dateKey := now.Format("2006-01-02")
+			currentMinute := now.Hour()*60 + now.Minute()
 
-		// Expire stale pending events every tick
-		expireAdvPendingEvents()
+			// Expire stale pending events every tick
+			expireAdvPendingEvents()
 
-		advEventScheduleMu.Lock()
-		if advEventScheduleDay != dateKey {
-			advEventSchedule = make(map[string]int)
-			advEventRolled = make(map[string]bool)
-			advEventScheduleDay = dateKey
-		}
+			// Auto-play any combat sessions past their 1h timeout.
+			p.reapExpiredCombatSessions()
 
-		// Schedule deferred rolls for any newly-acted players
-		chars, err := loadAllAdvCharacters()
-		if err != nil {
-			slog.Error("adventure: events: failed to load chars", "err", err)
+			advEventScheduleMu.Lock()
+			if advEventScheduleDay != dateKey {
+				advEventSchedule = make(map[string]int)
+				advEventRolled = make(map[string]bool)
+				advEventScheduleDay = dateKey
+			}
+
+			// Schedule deferred rolls for any newly-acted players
+			chars, err := loadAllAdvCharacters()
+			if err != nil {
+				slog.Error("adventure: events: failed to load chars", "err", err)
+				advEventScheduleMu.Unlock()
+				continue
+			}
+			for _, c := range chars {
+				uid := string(c.UserID)
+				if !c.Alive || advEventRolled[uid] {
+					continue
+				}
+				if _, scheduled := advEventSchedule[uid]; scheduled {
+					continue
+				}
+				if !c.HasActedToday() {
+					continue
+				}
+				// Assign a one-shot roll 60–180 minutes from now, capped to 23:50 UTC.
+				rollMinute := currentMinute + 60 + rand.IntN(121)
+				if rollMinute > 23*60+50 {
+					rollMinute = 23*60 + 50
+				}
+				advEventSchedule[uid] = rollMinute
+				slog.Info("adventure: event roll scheduled", "user", uid, "minute", rollMinute)
+			}
+
+			// Find players whose roll-minute has arrived
+			var toRoll []id.UserID
+			for uid, minute := range advEventSchedule {
+				if minute <= currentMinute && !advEventRolled[uid] {
+					toRoll = append(toRoll, id.UserID(uid))
+					advEventRolled[uid] = true
+				}
+			}
 			advEventScheduleMu.Unlock()
-			continue
-		}
-		for _, c := range chars {
-			uid := string(c.UserID)
-			if !c.Alive || advEventRolled[uid] {
-				continue
-			}
-			if _, scheduled := advEventSchedule[uid]; scheduled {
-				continue
-			}
-			if !c.HasActedToday() {
-				continue
-			}
-			// Assign a one-shot roll 60–180 minutes from now, capped to 23:50 UTC.
-			rollMinute := currentMinute + 60 + rand.IntN(121)
-			if rollMinute > 23*60+50 {
-				rollMinute = 23*60 + 50
-			}
-			advEventSchedule[uid] = rollMinute
-			slog.Info("adventure: event roll scheduled", "user", uid, "minute", rollMinute)
-		}
 
-		// Find players whose roll-minute has arrived
-		var toRoll []id.UserID
-		for uid, minute := range advEventSchedule {
-			if minute <= currentMinute && !advEventRolled[uid] {
-				toRoll = append(toRoll, id.UserID(uid))
-				advEventRolled[uid] = true
+			for _, uid := range toRoll {
+				p.tryTriggerEvent(uid)
 			}
 		}
-		advEventScheduleMu.Unlock()
-
-		for _, uid := range toRoll {
-			p.tryTriggerEvent(uid)
-		}
 	}
 }
 
@@ -112,6 +120,13 @@ func (p *AdventurePlugin) tryTriggerEvent(userID id.UserID) {
 		return
 	}
 
+	// Mid-fight: a turn-based session locks the run. Don't drop a random
+	// overworld event into a live fight — the player can't act on it without
+	// finishing the fight first, and the trigger DM talks over the combat feed.
+	if hasActiveCombatSession(userID) {
+		return
+	}
+
 	// 0.5% chance
 	if rand.Float64() >= 0.005 {
 		return
@@ -137,9 +152,11 @@ func (p *AdventurePlugin) tryTriggerEvent(userID id.UserID) {
 
 	slog.Info("adventure: mid-day event triggered", "user", userID, "event", event.Key, "id", eventID)
 
+	displayName, _ := loadDisplayName(userID)
+
 	// DM the player
 	triggerDM := advSubstituteFlavor(event.TriggerDM, map[string]string{
-		"{name}": char.DisplayName,
+		"{name}": displayName,
 	})
 	if err := p.SendDM(userID, triggerDM); err != nil {
 		slog.Error("adventure: events: failed to send trigger DM", "user", userID, "err", err)
@@ -149,7 +166,7 @@ func (p *AdventurePlugin) tryTriggerEvent(userID id.UserID) {
 	gr := gamesRoom()
 	if gr != "" {
 		roomLine := advSubstituteFlavor(advEventRoomTriggerWrapper, map[string]string{
-			"{trigger_room_line}": advSubstituteFlavor(event.TriggerRoomLine, map[string]string{"{name}": char.DisplayName}),
+			"{trigger_room_line}": advSubstituteFlavor(event.TriggerRoomLine, map[string]string{"{name}": displayName}),
 		})
 		_ = p.SendMessage(id.RoomID(gr), roomLine)
 	}
@@ -208,6 +225,7 @@ func (p *AdventurePlugin) handleEventRespond(ctx MessageContext) error {
 			}
 			checkAdvLevelUp(char, xpSkill)
 			_ = saveAdvCharacter(char)
+			_ = upsertPlayerMetaSkillState(ctx.Sender, skillStateFromAdvChar(char))
 		}
 	}
 

internal/plugin/adventure_flavor_babysit.go

@@ -28,6 +28,17 @@ var babysitDiaperLines = []string{
 	"The diapers. They happened. They were handled. Moving on.",
 }
 
+// babysitHighlightLines fire on auto-babysit days when the haul was unusually
+// good — making the babysitter feel like a companion rather than a silent
+// insurance product. Each line takes one %s slot for the focused skill name.
+var babysitHighlightLines = []string{
+	"The babysitter says your kid was a natural at %s today. They want it noted.",
+	"Solid day on the %s circuit, apparently. The babysitter looked smug about it.",
+	"Whatever the babysitter did with your %s gear — it worked. The numbers don't lie.",
+	"The babysitter handed in a %s haul and said nothing. The smug silence said plenty.",
+	"Your kid is, against the odds, getting alarmingly good at %s under TwinBee's care.",
+}
+
 // pickBabysitFlavor returns a random entry from the given pool.
 func pickBabysitFlavor(pool []string) string {
 	if len(pool) == 0 {

internal/plugin/adventure_flavor_closing.go

@@ -79,7 +79,7 @@ var ClosingSuccess = []string{
 		"in business and out of the deeper healthcare plans.\n\n" +
 		"Next action: {reset_time} ({time_until})\n" +
 		"Morning DM: {morning_time} UTC\n" +
-		"Evening summary: {summary_time} UTC — TwinBee will be there.\n\n" +
+		"Evening summary: {summary_time} UTC — I will be there.\n\n" +
 		"So will everyone else who showed up today.",
 }
 
@@ -171,7 +171,7 @@ var ClosingFailure = []string{
 		"So will you, which is the important part.\n\n" +
 		"Next action: {reset_time} ({time_until})\n" +
 		"Tomorrow's choices at {morning_time} UTC.\n" +
-		"TwinBee had a better day. The summary at {summary_time} UTC will confirm this.\n\n" +
+		"I had a better day. The summary at {summary_time} UTC will confirm this.\n\n" +
 		"Rest. You've earned the rest, at least.",
 
 	"─────────────────────────────\n" +

internal/plugin/adventure_flavor_hospital.go

@@ -52,6 +52,41 @@ var nurseJoyNudge = []string{
 		"Type `!hospital` to check in.",
 }
 
+// nurseJoyHaggleFlavor — Nurse Joy's reaction to the player's CHA haggle roll.
+// Indexed by hospitalHaggleOutcome (haggleFumble=0, haggleFail=1, haggleWin=2, haggleCrit=3).
+var nurseJoyHaggleFlavor = [][]string{
+	// haggleFumble — nat 1
+	{
+		"_you have drooled on the clipboard_ Oh sweetie. _gently dabs at it_ That's okay! We see this all the time. _has not seen this all the time._ Full price, but on the house emotionally!",
+		"You opened your mouth and a single, low groan came out. _she nods supportively_ I'll take that as 'fine with the full bill!' Wonderful negotiating!",
+		"_you tried to wink and both eyes closed_ Bless. We'll just go with the standard rate, sugar. Don't strain yourself.",
+		"You attempted charm. You produced a wet, rattling exhale. _Nurse Joy beams._ \"That's a yes to the full price! Great chat!\"",
+		"_you mumbled what you thought was a compliment about her hair_ That was a tube. That was the oxygen tube, honey. Full price!",
+	},
+	// haggleFail — d20+CHA below DC
+	{
+		"_smiles, doesn't blink_ I hear you, I do, but our pricing is set by the regional billing council and they are not sentimental people. Full bill it is!",
+		"That was a nice try! Really. _pats your hand_ Unfortunately I don't actually have the authority to discount anything, but it's so cute that you asked!",
+		"_tilts head sympathetically_ Oh, I would if I could! I really would. _she would not_ Standard rate, sugar.",
+		"Mm, no, that one didn't quite land for me. _still smiling_ But you're so brave for trying! Standard pricing applies.",
+	},
+	// haggleWin — pass
+	{
+		"_leans in conspiratorially_ You know what? You've been so polite. _types something_ I'm going to push this through as a 'goodwill adjustment.' Half off! Don't tell Derek.",
+		"_genuinely charmed_ Oh you're sweet. Okay, okay, I can flag this as a hardship case. Fifty percent off! _winks, has never winked at anyone before_",
+		"You know, the system has this little box for 'compassionate review' and I'm just _click_ going to go ahead and check that. There. Half price! Our little secret.",
+		"_giggles_ You're trouble. Okay — half off, but only because I like you, and because Derek is on lunch.",
+	},
+	// haggleCrit — nat 20
+	{
+		"_completely disarmed_ Oh my god. _puts down clipboard_ I haven't laughed like that on shift in YEARS. You know what? This one's on the house. Derek is going to have a complete meltdown and I do not care.",
+		"_dabs at her eye, recovering_ Sir. Ma'am. Whatever-you-are. That was the single most charming thing a corpse has ever said to me. Bill: waived. Walk it off.",
+		"_actually blushing_ I — okay. Okay! You know what? Free. It's free. _whispers to the ceiling_ Sorry Derek.",
+		"_stares at you for a long moment_ I'm calling it a clinical trial. You're the trial. There is no charge. Get out of here before I change my mind. _winks for real this time_",
+		"_to the orderlies_ Tear up the bill. _to you_ You, sugar, are a treasure. Discharge papers, no charge, complimentary water for the road.",
+	},
+}
+
 var nurseJoyAlive = []string{
 	"_looks up from clipboard_ You don't appear to be dead! That's great news! We love when people aren't dead. Come back if that changes! _cheerfully_",
 	"_tilts head_ Our records show you're... alive? That's wonderful! We don't actually treat alive people here. It's a whole different department. _waves vaguely_",
@@ -63,8 +98,22 @@ var nurseJoyAlreadyRevived = "You seem to have recovered on your own! " +
 
 // ── Room Announcements ───────────────────────────────────────────────────<E29480><E29480>─
 
-var hospitalDischargeAnnounce = "🏥 %s has been discharged from St. Guildmore's Memorial Hospital. " +
-	"Recovered. Back in action. The bill has been described as \"a lot.\""
+// hospitalDischargeBillDescriptors are the variants used for the
+// "The bill has been described as ..." sentence in the discharge announcement.
+// Some are bare adjectives ("devastating"); others are full quoted phrases.
+var hospitalDischargeBillDescriptors = []string{
+	"\"inhumane but probably normal by USA standards.\"",
+	"devastating.",
+	"ruinous.",
+	"soul-crushing.",
+	"\"proof that someone, somewhere, hates me specifically.\"",
+	"\"tearing to shreds what little hope I had left for humanity.\"",
+	"\"what I imagine my greatest enemies would charge me.\"",
+	"\"enough to make me reconsider the whole 'surviving' part.\"",
+}
+
+var hospitalDischargeAnnouncePrefix = "🏥 %s has been discharged from St. Guildmore's Memorial Hospital. " +
+	"Recovered. Back in action. The bill has been described as %s"
 
 var hospitalDitchAnnounce = "🏥 %s was brought into St. Guildmore's on a stretcher. " +
 	"They have been returned to the ditch. They'll be fine tomorrow."

internal/plugin/adventure_flavor_treasure.go

@@ -353,13 +353,13 @@ var SummaryDungeonExceptional = []string{
 }
 
 var SummaryDungeonDeath = []string{
-	"Died in {location}. Back in {hours}h. The {location} remains standing.",
-	"{location}: death. Equipment damaged. Healthcare involved. {hours}h respawn.",
-	"Did not survive {location}. The {location} did. {hours}h recovery.",
-	"Killed in {location}. American healthcare has the rest. {hours}h.",
-	"{location} wins this round. {name} recovers in {hours}h.",
-	"Dead. {location}. {hours} hours. The equipment is worse.",
-	"{name} lost the argument with {location}. Healthcare is mediating. {hours}h.",
+	"Died in {location}. Back in {duration}. The {location} remains standing.",
+	"{location}: death. Equipment damaged. Healthcare involved. {duration} respawn.",
+	"Did not survive {location}. The {location} did. {duration} recovery.",
+	"Killed in {location}. American healthcare has the rest. {duration}.",
+	"{location} wins this round. {name} recovers in {duration}.",
+	"Dead. {location}. {duration}. The equipment is worse.",
+	"{name} lost the argument with {location}. Healthcare is mediating. {duration}.",
 }
 
 var SummaryDungeonEmpty = []string{
@@ -381,11 +381,11 @@ var SummaryMiningSuccess = []string{
 }
 
 var SummaryMiningDeath = []string{
-	"Cave-in. {location}. Healthcare called. {hours}h.",
-	"Died in {location}. Mining death. Rarer than dungeon death. Still death. {hours}h.",
-	"{location} expressed structural concerns physically. {name}: {hours}h recovery.",
-	"The {location} ceiling had a perspective. {name}: medical. {hours}h.",
-	"Dead in {location}. The ore is still in there. {hours}h.",
+	"Cave-in. {location}. Healthcare called. {duration}.",
+	"Died in {location}. Mining death. Rarer than dungeon death. Still death. {duration}.",
+	"{location} expressed structural concerns physically. {name}: {duration} recovery.",
+	"The {location} ceiling had a perspective. {name}: medical. {duration}.",
+	"Dead in {location}. The ore is still in there. {duration}.",
 }
 
 var SummaryMiningEmpty = []string{
@@ -412,10 +412,10 @@ var SummaryForagingEmpty = []string{
 }
 
 var SummaryForagingDeath = []string{
-	"Died foraging. In {location}. Yes, foraging. {hours}h.",
-	"{location} produced a fatal outcome via non-combat means. {hours}h.",
-	"Dead in {location}. Bear/hornets/river/tree/mushroom involvement. {hours}h.",
-	"Foraging death. {location}. The forest won. {hours}h.",
+	"Died foraging. In {location}. Yes, foraging. {duration}.",
+	"{location} produced a fatal outcome via non-combat means. {duration}.",
+	"Dead in {location}. Bear/hornets/river/tree/mushroom involvement. {duration}.",
+	"Foraging death. {location}. The forest won. {duration}.",
 }
 
 var SummaryForagingHornets = []string{
@@ -442,7 +442,7 @@ var SummaryResting = []string{
 	"Resting today. XP: zero. Loot: zero. Alive: yes.",
 	"No action. Hovel. Wall. Nothing. Home.",
 	"Sat this one out. The dungeons noticed. The dungeons don't care.",
-	"Rest day. TwinBee noticed.",
+	"Rest day. I noticed.",
 }
 
 var SummaryDead = []string{
@@ -468,7 +468,7 @@ var SummaryStandoutDeath = []string{
 	"💀 {name} lost to {location}. The rats/goblins/trolls send their regards.",
 	"💀 Notable loss: {name} in {location}. Healthcare is familiar with the file.",
 	"💀 {name} did not survive {location} today. A learning experience. Expensive.",
-	"💀 {location} claimed {name}. {hours}h recovery. The dungeon has been noted.",
+	"💀 {location} claimed {name}. {duration} recovery. The dungeon has been noted.",
 }
 
 var SummaryStandoutTreasure = []string{
@@ -487,8 +487,8 @@ var SummaryStandoutHornets = []string{
 var TwinBeeSummarySuccess = []string{
 	"Visited {location}. Retrieved {loot} worth €{value}. Returned in excellent condition.",
 	"{location}: success. {loot} recovered at €{value}. Standard operation.",
-	"Cleared {location}. {loot}, €{value}. TwinBee has reported this as typical.",
-	"{loot} worth €{value} from {location}. TwinBee is unsurprised.",
+	"Cleared {location}. {loot}, €{value}. I have reported this as typical.",
+	"{loot} worth €{value} from {location}. I am unsurprised.",
 	"Professional operation in {location}. {loot}, €{value}. No further comment.",
 }
 
@@ -497,11 +497,11 @@ var TwinBeeSummaryWithdrawal = []string{
 	"{location}: early departure. Strategic positioning. Returns tomorrow.",
 	"Reconnaissance of {location} complete. Phase Two: tomorrow.",
 	"Withdrew from {location} on schedule. The schedule has been updated.",
-	"{location} assessed. TwinBee returns tomorrow. The {location} has been warned.",
+	"{location} assessed. I return tomorrow. The {location} has been warned.",
 }
 
 var TwinBeeSummaryEmpty = []string{
-	"Visited {location}. Nothing there today. TwinBee notes this for the record.",
-	"{location}: empty. The dungeon has failed to provide. TwinBee has noted it.",
-	"Nothing found in {location}. TwinBee is filing feedback with the dungeon.",
+	"Visited {location}. Nothing there today. I note this for the record.",
+	"{location}: empty. The dungeon has failed to provide. I have noted it.",
+	"Nothing found in {location}. I am filing feedback with the dungeon.",
 }

internal/plugin/adventure_flavor_twinbee.go

@@ -7,268 +7,268 @@ package plugin
 // from victories, looked at the right way, which is TwinBee's way.
 
 var TwinBeeSuccess = []string{
-	"TwinBee descended into {location} with characteristic enthusiasm " +
+	"I descended into {location} with characteristic enthusiasm " +
 		"and the kind of confidence that makes dungeon monsters briefly " +
 		"reconsider their career choices. Several reconsidered too slowly. " +
-		"TwinBee has returned with {loot} worth €{value} and a new personal philosophy " +
+		"I have returned with {loot} worth €{value} and a new personal philosophy " +
 		"regarding the optimum angle of attack on a Stone Golem. " +
 		"The philosophy works. It has been field-tested. Just now.",
 
-	"Another flawless operation. TwinBee entered {location}, assessed the situation " +
+	"Another flawless operation. I entered {location}, assessed the situation " +
 		"with professional precision, and extracted {loot} worth €{value} " +
-		"with minimal collateral damage to TwinBee specifically. " +
+		"with minimal collateral damage to me specifically. " +
 		"The dungeon has been informed it performed adequately. " +
-		"TwinBee does not give compliments freely. This was a compliment.",
+		"I do not give compliments freely. This was a compliment.",
 
-	"TwinBee has returned from {location} victorious, which is to say " +
-		"TwinBee has returned from {location}, because for TwinBee these are the same thing. " +
-		"{loot} worth €{value}. {xp} XP that TwinBee does not need " +
-		"but accepts graciously, as a gift, from the dungeon. " +
+	"I have returned from {location} victorious, which is to say " +
+		"I have returned from {location}, because for me these are the same thing. " +
+		"{loot} worth €{value}. {xp} XP that I do not need " +
+		"but accept graciously, as a gift, from the dungeon. " +
 		"The dungeon can try harder next time. It probably won't. They never do.",
 
-	"TwinBee located {loot} worth €{value} in {location} after what TwinBee " +
-		"is describing in the post-mission debrief as 'a series of increasingly correct decisions.' " +
+	"I located {loot} worth €{value} in {location} after what I am " +
+		"describing in the post-mission debrief as 'a series of increasingly correct decisions.' " +
 		"The monsters involved have been described as 'adequate opposition' " +
-		"in the same debrief. TwinBee is generous with these things.",
+		"in the same debrief. I am generous with these things.",
 
 	"In. Retrieved {loot}. Out. €{value}. {xp} XP. " +
-		"TwinBee has the efficiency of someone who has done this many times " +
+		"I have the efficiency of someone who has done this many times " +
 		"and the confidence of someone who has never once considered " +
 		"that it might not go well. These two qualities, combined, produce results. " +
 		"The results are in your share of the haul.",
 
-	"TwinBee reports: {location} cleared, {loot} secured, €{value} assessed, " +
-		"one near-miss that TwinBee is not classifying as a near-miss " +
-		"because TwinBee does not have near-misses, TwinBee has " +
+	"I report: {location} cleared, {loot} secured, €{value} assessed, " +
+		"one near-miss that I am not classifying as a near-miss " +
+		"because I do not have near-misses, I have " +
 		"'moments of dynamic tactical adjustment that resolved favorably.' " +
 		"The moment resolved favorably. Obviously.",
 
-	"The {location} boss encountered TwinBee today. " +
-		"This is how TwinBee prefers to frame the encounter — " +
-		"the boss encountered TwinBee, not the other way around — " +
+	"The {location} boss encountered me today. " +
+		"This is how I prefer to frame the encounter — " +
+		"the boss encountered me, not the other way around — " +
 		"because it accurately reflects the power dynamics. " +
 		"{loot} worth €{value}. The boss has been encountered.",
 
-	"TwinBee went to {location} and came back with {loot} worth €{value}, " +
-		"which is what TwinBee does, and {xp} XP, which TwinBee acknowledges " +
+	"I went to {location} and came back with {loot} worth €{value}, " +
+		"which is what I do, and {xp} XP, which I acknowledge " +
 		"with the quiet grace of someone for whom excellence " +
 		"has long since stopped being a surprise.",
 
 	"Professional assessment of today's {location} operation: successful. " +
 		"Loot: {loot}, €{value}. Opposition: handled. Duration: optimal. " +
-		"TwinBee's equipment: immaculate. TwinBee: as expected.",
+		"My equipment: immaculate. Me: as expected.",
 
-	"TwinBee extracted {loot} worth €{value} from {location} " +
+	"I extracted {loot} worth €{value} from {location} " +
 		"with the efficiency of a professional and the cheerfulness of someone " +
-		"who genuinely enjoys doing this, which TwinBee does, " +
-		"which is why TwinBee is better at it than everyone else, " +
-		"which TwinBee is.",
+		"who genuinely enjoys doing this, which I do, " +
+		"which is why I am better at it than everyone else, " +
+		"which I am.",
 
 	"The monsters in {location} gave it their best today. " +
-		"TwinBee noticed this and respected it for the duration of the encounter, " +
+		"I noticed this and respected it for the duration of the encounter, " +
 		"which was brief. {loot} worth €{value}. {xp} XP. " +
-		"TwinBee has returned in excellent spirits, which is not news, " +
+		"I have returned in excellent spirits, which is not news, " +
 		"but it is accurate.",
 
-	"TwinBee's route through {location} was, according to TwinBee's own review, " +
+	"My route through {location} was, according to my own review, " +
 		"'essentially perfect.' No argument has been presented to the contrary. " +
-		"TwinBee returned with {loot} worth €{value} and a complete absence " +
-		"of anything that went wrong, which is TwinBee's preferred kind of absence.",
+		"I returned with {loot} worth €{value} and a complete absence " +
+		"of anything that went wrong, which is my preferred kind of absence.",
 
 	"A lesser adventurer would have found {location} challenging today. " +
-		"TwinBee found it brisk. {loot}, €{value}, {xp} XP, " +
+		"I found it brisk. {loot}, €{value}, {xp} XP, " +
 		"and the mild satisfaction of a problem that turned out " +
-		"to be an appropriately-sized problem. TwinBee appreciates appropriate sizing.",
+		"to be an appropriately-sized problem. I appreciate appropriate sizing.",
 
-	"TwinBee entered {location} from the north approach, which TwinBee has determined " +
+	"I entered {location} from the north approach, which I have determined " +
 		"is the correct approach, and exited with {loot} worth €{value}. " +
 		"The southern approach is noted. It is not the correct approach. " +
-		"TwinBee has opinions about approaches and they are correct opinions.",
+		"I have opinions about approaches and they are correct opinions.",
 
 	"Operational summary: {location} visited, opposition encountered, opposition handled, " +
 		"{loot} extracted at €{value} assessed value, {xp} XP collected, " +
-		"TwinBee returned in the condition TwinBee left in, " +
-		"which is optimal, because TwinBee is always in optimal condition.",
+		"I returned in the condition I left in, " +
+		"which is optimal, because I am always in optimal condition.",
 }
 
 var TwinBeeExceptional = []string{
-	"OUTSTANDING PERFORMANCE. TwinBee located and neutralised the dungeon boss " +
-		"— which TwinBee describes as 'a scheduling conflict that has now been resolved' — " +
+	"OUTSTANDING PERFORMANCE. I located and neutralised the dungeon boss " +
+		"— which I describe as 'a scheduling conflict that has now been resolved' — " +
 		"and recovered {loot} worth €{value}. " +
-		"This is, according to TwinBee, a typical Tuesday. " +
-		"TwinBee has had many exceptional Tuesdays. The dungeons are aware.",
+		"This is, by my reckoning, a typical Tuesday. " +
+		"I have had many exceptional Tuesdays. The dungeons are aware.",
 
-	"TwinBee found {loot} worth €{value} in {location} after what TwinBee " +
-		"is calling 'a brief but educational exchange' with something very large " +
+	"I found {loot} worth €{value} in {location} after what I am " +
+		"calling 'a brief but educational exchange' with something very large " +
 		"that is no longer a going concern. Bonus XP noted. " +
-		"TwinBee noted it first. TwinBee notes everything first.",
+		"I noted it first. I note everything first.",
 
-	"The inner chamber. TwinBee reached the inner chamber. " +
-		"TwinBee notes that reaching the inner chamber requires " +
+	"The inner chamber. I reached the inner chamber. " +
+		"I note that reaching the inner chamber requires " +
 		"the successful navigation of everything between here and the inner chamber, " +
-		"which TwinBee navigated successfully, and then {loot} worth €{value} " +
-		"was in the inner chamber, and TwinBee took it. " +
+		"which I navigated successfully, and then {loot} worth €{value} " +
+		"was in the inner chamber, and I took it. " +
 		"The inner chamber is now available to be an outer chamber.",
 
-	"A boss encounter. TwinBee's assessment of the boss: 'interesting.' " +
-		"The boss's assessment of TwinBee: insufficient time to complete. " +
-		"{loot} worth €{value}. TwinBee has forwarded the boss's personnel file " +
+	"A boss encounter. My assessment of the boss: 'interesting.' " +
+		"The boss's assessment of me: insufficient time to complete. " +
+		"{loot} worth €{value}. I have forwarded the boss's personnel file " +
 		"to the relevant afterlife authorities with a positive reference.",
 
-	"EXCEPTIONAL. TwinBee's word, used sparingly. " +
+	"EXCEPTIONAL. My word, used sparingly. " +
 		"Today merits it. {loot} worth €{value} from the deepest chamber " +
-		"of {location}, retrieved past opposition that TwinBee describes " +
+		"of {location}, retrieved past opposition that I describe " +
 		"as 'the most interesting opposition I've faced this week,' " +
-		"which is high praise from TwinBee and accurately assesses the week so far.",
+		"which is high praise from me and accurately assesses the week so far.",
 
-	"TwinBee found something the dungeon wasn't offering publicly. " +
-		"TwinBee finds things dungeons aren't offering publicly. " +
+	"I found something the dungeon wasn't offering publicly. " +
+		"I find things dungeons aren't offering publicly. " +
 		"It's a skill. {loot} worth €{value}. {xp} XP. " +
-		"The dungeon has updated its offering. TwinBee approves of the update " +
+		"The dungeon has updated its offering. I approve of the update " +
 		"from a position of already having taken the thing.",
 
 	"A critical run. Every encounter resolved correctly. Every chamber yielded. " +
 		"Every roll, every decision, every approach: correct. " +
 		"{loot} worth €{value}. {xp} XP. " +
-		"TwinBee submits this run as the reference standard for {location}. " +
+		"I submit this run as the reference standard for {location}. " +
 		"Future runs should aspire to this. They will not reach it.",
 
-	"The boss was large. TwinBee is TwinBee. " +
+	"The boss was large. I am here. " +
 		"These two facts met in {location} and produced {loot} worth €{value} " +
-		"and a story that TwinBee is telling to everyone and will continue telling " +
-		"until a better story replaces it, which will also be TwinBee's story.",
+		"and a story that I am telling to everyone and will continue telling " +
+		"until a better story replaces it, which will also be my story.",
 }
 
 var TwinBeeWithdrawal = []string{
-	"TwinBee has completed today's operation and is taking the remainder " +
+	"I have completed today's operation and am taking the remainder " +
 		"of the afternoon for strategic planning. " +
 		"This is unrelated to {location}. {location} is unrelated to everything. " +
-		"TwinBee has already moved on and suggests you do the same.",
+		"I have already moved on and suggest you do the same.",
 
-	"TwinBee assessed {location} with characteristic thoroughness, " +
+	"I assessed {location} with characteristic thoroughness, " +
 		"identified that today's objectives had been sufficiently advanced " +
 		"by the reconnaissance phase, and withdrew in good order " +
-		"before the situation became interesting in ways TwinBee did not schedule. " +
-		"This is called professionalism. TwinBee has it.",
+		"before the situation became interesting in ways I did not schedule. " +
+		"This is called professionalism. I have it.",
 
 	"Today's operation at {location} concluded earlier than projected. " +
-		"TwinBee encountered something very large, evaluated the encounter on its merits, " +
+		"I encountered something very large, evaluated the encounter on its merits, " +
 		"and determined that returning tomorrow with more information " +
 		"was the superior strategic outcome. " +
-		"TwinBee was not running. TwinBee does not run. " +
-		"TwinBee was moving with purpose in the opposite direction. These are different.",
+		"I was not running. I do not run. " +
+		"I was moving with purpose in the opposite direction. These are different.",
 
-	"TwinBee left {location} at a time of TwinBee's choosing, " +
+	"I left {location} at a time of my own choosing, " +
 		"which happened to coincide with the arrival of something " +
-		"that TwinBee is describing in the official report as 'a scheduling conflict.' " +
+		"that I am describing in the official report as 'a scheduling conflict.' " +
 		"The conflict has been noted. It will be addressed. Tomorrow. " +
-		"At a time that suits TwinBee.",
+		"At a time that suits me.",
 
 	"TACTICAL WITHDRAWAL EXECUTED. {location} has been informed, " +
-		"via the medium of TwinBee's departure, that today was not the day. " +
-		"TwinBee knows which days are the days. Today was for gathering intelligence. " +
+		"via the medium of my departure, that today was not the day. " +
+		"I know which days are the days. Today was for gathering intelligence. " +
 		"The intelligence gathered is: {location} still exists and should watch itself.",
 
-	"TwinBee retreated from {location} in the same way the tide retreats from the shore — " +
+	"I retreated from {location} in the same way the tide retreats from the shore — " +
 		"deliberately, inevitably, and with the full understanding that it will be back, " +
 		"and the shore knows this, and the shore is thinking about it right now.",
 
-	"Something in {location} today required TwinBee to make a decision. " +
-		"TwinBee made the decision. The decision was: not today. " +
-		"TwinBee's decisions are correct decisions by definition, " +
+	"Something in {location} today required me to make a decision. " +
+		"I made the decision. The decision was: not today. " +
+		"My decisions are correct decisions by definition, " +
 		"which means 'not today' was correct, which will be proven correct " +
-		"when TwinBee returns tomorrow and the thing is no longer a factor. " +
-		"These things always work out when TwinBee decides they will.",
+		"when I return tomorrow and the thing is no longer a factor. " +
+		"These things always work out when I decide they will.",
 
 	"The mission objectives for today's {location} operation have been " +
 		"reclassified as 'Phase One of a Two-Phase Operation,' " +
 		"where Phase One is reconnaissance and Phase Two is tomorrow. " +
 		"Phase One is complete. Phase One was, in retrospect, always the plan.",
 
-	"TwinBee encountered something in {location} that TwinBee is describing " +
+	"I encountered something in {location} that I am describing " +
 		"as 'an opportunity to demonstrate strategic patience.' " +
-		"TwinBee demonstrated strategic patience. The patience was demonstrated " +
+		"I demonstrated strategic patience. The patience was demonstrated " +
 		"at significant velocity in the direction of the exit, " +
 		"but the patience was present throughout.",
 
-	"Official statement from TwinBee regarding today's {location} operation: " +
+	"Official statement from me regarding today's {location} operation: " +
 		"'Everything went according to plan.' " +
 		"The plan has been updated to reflect what happened. " +
 		"The updated plan describes what happened as planned. " +
-		"TwinBee's plans are always accurate.",
+		"My plans are always accurate.",
 
-	"TwinBee is back. The thing in {location} is also still there. " +
-		"TwinBee is aware of the thing. The thing is aware of TwinBee. " +
-		"This is a stalemate that TwinBee will resolve on TwinBee's timeline, " +
+	"I am back. The thing in {location} is also still there. " +
+		"I am aware of the thing. The thing is aware of me. " +
+		"This is a stalemate that I will resolve on my own timeline, " +
 		"which is different from the thing's timeline, " +
-		"and TwinBee's timeline is the one that matters.",
+		"and my timeline is the one that matters.",
 
-	"The {location} situation has been described by TwinBee as " +
-		"'temporarily inconclusive,' which is a phrase TwinBee uses " +
+	"The {location} situation has been described, by me, as " +
+		"'temporarily inconclusive,' which is a phrase I use " +
 		"when something very large expressed a strong position " +
-		"and TwinBee has chosen to revisit the position on better terms. " +
-		"The terms will be better. TwinBee will see to it.",
+		"and I have chosen to revisit the position on better terms. " +
+		"The terms will be better. I will see to it.",
 
-	"Today, TwinBee gathered extensive tactical data on {location}. " +
+	"Today, I gathered extensive tactical data on {location}. " +
 		"The data indicates that {location} is well-defended. " +
 		"The data was gathered by going in and then coming back out, " +
 		"which is a time-honoured data gathering methodology " +
-		"that TwinBee has employed before and will employ again, ideally less urgently.",
+		"that I have employed before and will employ again, ideally less urgently.",
 
-	"TwinBee's return today is best understood as a 'victory lap around the outside,' " +
-		"which is a phrase TwinBee has just coined and will be using going forward. " +
+	"My return today is best understood as a 'victory lap around the outside,' " +
+		"which is a phrase I have just coined and will be using going forward. " +
 		"A victory lap around the outside of {location} has been completed. " +
-		"TwinBee is home. The inside of {location} is tomorrow's victory lap.",
+		"I am home. The inside of {location} is tomorrow's victory lap.",
 
-	"Something the size of a building expressed interest in TwinBee at depth. " +
-		"TwinBee expressed equal and opposite interest in being elsewhere. " +
-		"Both interests were satisfied. TwinBee is elsewhere. " +
+	"Something the size of a building expressed interest in me at depth. " +
+		"I expressed equal and opposite interest in being elsewhere. " +
+		"Both interests were satisfied. I am elsewhere. " +
 		"The something is where it was. The relationship is stable.",
 }
 
 var TwinBeeEmpty = []string{
-	"TwinBee has returned from {location} and wishes it to be known " +
-		"that the dungeon was empty, which TwinBee attributes entirely to their reputation " +
-		"preceding them. The monsters left. They knew. " +
-		"TwinBee respects this. TwinBee also found nothing. These facts are unrelated.",
+	"I have returned from {location} and wish it to be known " +
+		"that the dungeon was empty, which I attribute entirely to my reputation " +
+		"preceding me. The monsters left. They knew. " +
+		"I respect this. I also found nothing. These facts are unrelated.",
 
 	"Intelligence suggested {location} would be productive today. " +
-		"TwinBee's intelligence was incorrect. " +
-		"TwinBee's intelligence is reviewing its methodology. " +
+		"My intelligence was incorrect. " +
+		"My intelligence is reviewing its methodology. " +
 		"The dungeon contained no loot, no monsters worth discussing, " +
-		"and one confused bat that TwinBee has agreed not to mention publicly. " +
+		"and one confused bat that I have agreed not to mention publicly. " +
 		"Moving on.",
 
-	"{location} was cleared. By whom is unclear. TwinBee suspects a rival. " +
-		"TwinBee does not have rivals, technically, " +
-		"but is prepared to invent one for the purposes of this grievance. " +
+	"{location} was cleared. By whom is unclear. I suspect a rival. " +
+		"I do not have rivals, technically, " +
+		"but am prepared to invent one for the purposes of this grievance. " +
 		"No loot. No comment. The rival has been noted.",
 
 	"The {location} run today yielded nothing of material value, " +
-		"which TwinBee attributes to the universe's temporary misalignment " +
-		"with TwinBee's interests. The universe will correct itself. " +
-		"TwinBee is giving it until tomorrow.",
+		"which I attribute to the universe's temporary misalignment " +
+		"with my interests. The universe will correct itself. " +
+		"I am giving it until tomorrow.",
 
 	"Empty. {location} was empty today, which is {location}'s problem. " +
-		"TwinBee showed up. TwinBee was prepared. TwinBee had the right equipment. " +
+		"I showed up. I was prepared. I had the right equipment. " +
 		"The dungeon failed to provide an adequate challenge or adequate reward. " +
 		"This reflects poorly on the dungeon.",
 
-	"TwinBee cleared four rooms of {location} and found nothing worth the trip. " +
-		"TwinBee is not saying the trip was not worth it — TwinBee does not say that — " +
+	"I cleared four rooms of {location} and found nothing worth the trip. " +
+		"I am not saying the trip was not worth it — I do not say that — " +
 		"but the material outcome was zero and the XP was minimal " +
-		"and TwinBee would like to register this as feedback for the dungeon.",
+		"and I would like to register this as feedback for the dungeon.",
 
-	"The treasure was already gone when TwinBee arrived, " +
-		"which means someone got there before TwinBee, " +
+	"The treasure was already gone when I arrived, " +
+		"which means someone got there before me, " +
 		"which is a sentence that has never previously been true " +
-		"and which TwinBee is treating as a statistical anomaly " +
+		"and which I am treating as a statistical anomaly " +
 		"rather than a pattern that might develop.",
 
 	"No monsters. No treasure. No meaningful opposition. " +
-		"Just TwinBee in {location} swinging at things that weren't there. " +
-		"TwinBee has described this run as 'character-building.' " +
-		"TwinBee's character was already built. " +
+		"Just me in {location} swinging at things that weren't there. " +
+		"I have described this run as 'character-building.' " +
+		"My character was already built. " +
 		"This run has contributed nothing to the structure.",
 }
 
@@ -529,51 +529,38 @@ var RespawnDM = []string{
 }
 
 var IdleShameDM = []string{
-	"{name}, you didn't leave the house today.\n\n" +
-		"Your adventurer sat in their hovel, stared at the wall,\n" +
-		"and achieved absolutely nothing. No loot. No XP. No death,\n" +
-		"which is honestly the nicest thing that can be said about today.\n\n" +
-		"Tomorrow's choices arrive at 08:00 UTC.\n" +
-		"Please, for the love of everything, try to be brave.",
+	"{name}, hey. Didn't see you out there today.\n\n" +
+		"I swung by the hovel — door was shut, no answer.\n" +
+		"Hope you're alright. The dungeon will keep. The mine will keep.\n" +
+		"They've been there a while; they're patient.\n\n" +
+		"Tomorrow: 08:00 UTC. We'll be ready when you are.",
 
-	"No action today, {name}.\n\n" +
-		"The morning DM was sent. The morning DM was not answered.\n" +
-		"The dungeon was there. The mine was there. The forest was there.\n" +
-		"You were also there, presumably, somewhere, not responding.\n\n" +
-		"TwinBee noticed. The daily summary has noted your absence.\n" +
-		"Tomorrow: 08:00 UTC. The options will be there. Please be there too.",
+	"Quiet day for you, {name}.\n\n" +
+		"The morning DM went out and didn't come back. That happens.\n" +
+		"Real life sometimes shows up uninvited and stays for dinner.\n" +
+		"I picked up a little extra in the field — covered for you.\n\n" +
+		"Tomorrow morning the choices reset. Drop by when you can.",
 
-	"{name}. You rested today.\n\n" +
-		"'Rested' is the word being used. It is the charitable word.\n" +
-		"The uncharitable word is 'nothing.' You did nothing.\n" +
-		"The dungeons are still there. The mines are still there.\n" +
-		"The foraging areas are still there. Your XP is still where you left it.\n\n" +
-		"08:00 UTC tomorrow. An adventure awaits.\n" +
-		"The adventure has been waiting since you ignored it this morning.",
+	"{name}, no sign of you in the field today.\n\n" +
+		"The forest is still there. So's the mine. So's that one rusted sword\n" +
+		"you keep meaning to replace. Nothing important moved.\n\n" +
+		"08:00 UTC tomorrow — fresh menu, same patient narrator.",
 
-	"Today passed without you, {name}.\n\n" +
-		"TwinBee went to a dungeon. The dungeon was real.\n" +
-		"Your share of TwinBee's haul was distributed to people who showed up.\n" +
-		"You did not show up. You did not get a share.\n" +
-		"TwinBee noticed. TwinBee says nothing.\n" +
-		"TwinBee's silence is louder than most things.\n\n" +
-		"Tomorrow: 08:00 UTC. Show up.",
+	"Missed you out there, {name}.\n\n" +
+		"I went on a haul today and saved a corner of the splits for you,\n" +
+		"then ate it on principle when you didn't show. (Sorry. House rule.)\n" +
+		"Nothing's lost that can't be earned back.\n\n" +
+		"Tomorrow: 08:00 UTC. The dungeons are warm.",
 
-	"A day of rest, {name}. Unearned, but rest.\n\n" +
-		"The hovel is comfortable. The wall is familiar.\n" +
-		"Nothing in the hovel tried to kill you, which is the one advantage the hovel has.\n" +
-		"The hovel also paid you nothing and taught you nothing and advanced nothing.\n" +
-		"The hovel is comfortable and useless. So was today.\n\n" +
-		"Tomorrow is 08:00 UTC. The choices will be new ones.\n" +
-		"Make one of them. Any of them. Please.",
+	"A quiet day, {name}. Those happen.\n\n" +
+		"You weren't on the trail. The trail didn't fall apart without you.\n" +
+		"It'll be there tomorrow, and the day after, and the one after that.\n\n" +
+		"08:00 UTC. Whenever you're back, we pick up where we left off.",
 
-	"Where were you today, {name}?\n\n" +
-		"The bot sent the DM. The DM was delivered.\n" +
-		"The DM sat there, unread or unresponded-to, while your adventurer\n" +
-		"sat in the hovel and the day happened without them.\n" +
-		"XP: not gained. Loot: not found. Death: at least avoided.\n\n" +
-		"Low bar. You cleared the low bar by doing nothing.\n" +
-		"Tomorrow: 08:00 UTC. Clear a higher bar.",
+	"{name}. Hope you had a good rest day.\n\n" +
+		"I held down the fort. Nothing dramatic, nothing lost —\n" +
+		"the world declined to end on your behalf, which feels generous.\n\n" +
+		"When you're ready, the morning DM hits at 08:00 UTC. No rush.",
 }
 
 var OnboardingDM = []string{
@@ -597,8 +584,8 @@ var OnboardingDM = []string{
 var MorningDM = []string{
 	"⚔️ Good morning, {name}. Another day, another opportunity for regret.\n\n" +
 		"{character_sheet}\n\n" +
-		"Where are you headed? TwinBee would choose the dungeon.\n" +
-		"TwinBee would also survive it. You are not TwinBee. Choose wisely.",
+		"Where are you headed? I would choose the dungeon.\n" +
+		"I would also survive it. You are not TwinBee. Choose wisely.",
 
 	"⚔️ {name}. You're alive. The options are:\n\n" +
 		"{character_sheet}\n\n" +
@@ -622,6 +609,6 @@ var MorningDM = []string{
 		"{character_sheet}\n\n" +
 		"Or don't. You could rest. You could do nothing.\n" +
 		"The bot will send you a disappointed DM at midnight.\n" +
-		"TwinBee will know. TwinBee always knows.\n" +
+		"I will know. I always know.\n" +
 		"Reply to choose.",
 }

internal/plugin/adventure_followups_test.go

@@ -0,0 +1,351 @@
+package plugin
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+	"time"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// ── Equipment Mastery ──────────────────────────────────────────────────────
+
+func TestAdvEquipmentMasteryBonus(t *testing.T) {
+	cases := []struct {
+		name string
+		used map[EquipmentSlot]int
+		want float64
+	}{
+		{"empty equip", nil, 0},
+		{"all sub-50", map[EquipmentSlot]int{SlotWeapon: 49, SlotArmor: 1}, 0},
+		{"one slot crossed first threshold", map[EquipmentSlot]int{SlotWeapon: 50}, 1},
+		{"one slot at all three thresholds", map[EquipmentSlot]int{SlotWeapon: 250}, 3},
+		{"mixed: 100 + 50", map[EquipmentSlot]int{SlotWeapon: 100, SlotArmor: 50}, 3},
+		{"all 5 slots maxed = 15 raw, capped at 10", map[EquipmentSlot]int{
+			SlotWeapon: 999, SlotArmor: 999, SlotHelmet: 999, SlotBoots: 999, SlotTool: 999,
+		}, 10},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			equip := map[EquipmentSlot]*AdvEquipment{}
+			for slot, used := range tc.used {
+				equip[slot] = &AdvEquipment{ActionsUsed: used}
+			}
+			got := advEquipmentMasteryBonus(equip)
+			if got != tc.want {
+				t.Errorf("got %.1f, want %.1f", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestAdvSlotRelevantToActivity(t *testing.T) {
+	cases := []struct {
+		slot     EquipmentSlot
+		activity AdvActivityType
+		want     bool
+	}{
+		// Combat exercises the combat loadout.
+		{SlotWeapon, AdvActivityDungeon, true},
+		{SlotArmor, AdvActivityDungeon, true},
+		{SlotHelmet, AdvActivityDungeon, true},
+		{SlotBoots, AdvActivityDungeon, true},
+		{SlotTool, AdvActivityDungeon, false}, // a dungeon shouldn't master a pickaxe
+
+		// Each harvest activity exercises only the tool.
+		{SlotTool, AdvActivityMining, true},
+		{SlotTool, AdvActivityForaging, true},
+		{SlotTool, AdvActivityFishing, true},
+		{SlotWeapon, AdvActivityMining, false}, // foraging shouldn't master a sword
+		{SlotArmor, AdvActivityForaging, false},
+		{SlotHelmet, AdvActivityFishing, false},
+		{SlotBoots, AdvActivityMining, false},
+	}
+	for _, tc := range cases {
+		t.Run(fmt.Sprintf("%s_%s", tc.slot, tc.activity), func(t *testing.T) {
+			if got := advSlotRelevantToActivity(tc.slot, tc.activity); got != tc.want {
+				t.Errorf("got %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestAdvMasteryRowSegment(t *testing.T) {
+	cases := []struct {
+		used int
+		want string
+	}{
+		{0, ""},
+		{1, "1/50"},
+		{49, "49/50"},
+		{50, "50/100 ✦"},
+		{99, "99/100 ✦"},
+		{100, "100/250 ✦✦"},
+		{249, "249/250 ✦✦"},
+		{250, "250 ✦✦✦"},
+		{500, "500 ✦✦✦"},
+	}
+	for _, tc := range cases {
+		t.Run(fmt.Sprintf("used=%d", tc.used), func(t *testing.T) {
+			if got := advMasteryRowSegment(tc.used); got != tc.want {
+				t.Errorf("got %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestAdvMasteryRollup(t *testing.T) {
+	cases := []struct {
+		name             string
+		used             map[EquipmentSlot]int
+		wantCrossed      int
+		wantMaxed        int
+		wantBonus        float64
+		wantAnyProgress  bool
+	}{
+		{"empty", nil, 0, 0, 0, false},
+		{"sub-50 only", map[EquipmentSlot]int{SlotWeapon: 30}, 0, 0, 0, true},
+		{"one slot 1 threshold", map[EquipmentSlot]int{SlotWeapon: 50}, 1, 0, 1, true},
+		{"one slot maxed", map[EquipmentSlot]int{SlotWeapon: 250}, 3, 1, 3, true},
+		{"two slots, 5 thresholds", map[EquipmentSlot]int{SlotWeapon: 100, SlotArmor: 250}, 5, 1, 5, true},
+		{"all maxed = 15 raw, capped at 10", map[EquipmentSlot]int{
+			SlotWeapon: 999, SlotArmor: 999, SlotHelmet: 999, SlotBoots: 999, SlotTool: 999,
+		}, 15, 5, 10, true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			equip := map[EquipmentSlot]*AdvEquipment{}
+			for slot, used := range tc.used {
+				equip[slot] = &AdvEquipment{ActionsUsed: used}
+			}
+			got := advMasteryRollup(equip)
+			if got.ThresholdsCrossed != tc.wantCrossed {
+				t.Errorf("ThresholdsCrossed: got %d, want %d", got.ThresholdsCrossed, tc.wantCrossed)
+			}
+			if got.MaxedSlots != tc.wantMaxed {
+				t.Errorf("MaxedSlots: got %d, want %d", got.MaxedSlots, tc.wantMaxed)
+			}
+			if got.Bonus != tc.wantBonus {
+				t.Errorf("Bonus: got %.1f, want %.1f", got.Bonus, tc.wantBonus)
+			}
+			if got.AnyProgress != tc.wantAnyProgress {
+				t.Errorf("AnyProgress: got %v, want %v", got.AnyProgress, tc.wantAnyProgress)
+			}
+		})
+	}
+}
+
+func TestRenderAdvMasteryAggregate(t *testing.T) {
+	cases := []struct {
+		name          string
+		used          map[EquipmentSlot]int
+		wantEmpty     bool
+		wantSubstring []string
+		wantNot       []string
+	}{
+		{"no progress → empty", nil, true, nil, nil},
+		{"sub-threshold progress → building up", map[EquipmentSlot]int{SlotWeapon: 30},
+			false, []string{"building up", "first threshold at 50"}, []string{"+0%", "loot quality"}},
+		{"one threshold crossed → singular threshold", map[EquipmentSlot]int{SlotWeapon: 50},
+			false, []string{"+1% loot quality", "1 threshold crossed"}, []string{"thresholds", "maxed", "cap reached"}},
+		{"three thresholds, no maxed → plural threshold no maxed", map[EquipmentSlot]int{SlotWeapon: 100, SlotArmor: 50},
+			false, []string{"+3% loot quality", "3 thresholds crossed"}, []string{"maxed", "cap reached"}},
+		{"one maxed + extras → mention maxed slot", map[EquipmentSlot]int{SlotWeapon: 250, SlotArmor: 50},
+			false, []string{"+4% loot quality", "4 thresholds crossed", "1 slot maxed"}, []string{"cap reached", "slots maxed"}},
+		{"capped → flag cap reached", map[EquipmentSlot]int{
+			SlotWeapon: 250, SlotArmor: 250, SlotHelmet: 250, SlotBoots: 250, SlotTool: 250,
+		}, false, []string{"+10% loot quality", "15 thresholds crossed", "5 slots maxed", "cap reached"}, nil},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			equip := map[EquipmentSlot]*AdvEquipment{}
+			for slot, used := range tc.used {
+				equip[slot] = &AdvEquipment{ActionsUsed: used}
+			}
+			got := renderAdvMasteryAggregate(equip)
+			if tc.wantEmpty {
+				if got != "" {
+					t.Fatalf("expected empty, got %q", got)
+				}
+				return
+			}
+			if got == "" {
+				t.Fatalf("expected non-empty, got empty")
+			}
+			for _, s := range tc.wantSubstring {
+				if !strings.Contains(got, s) {
+					t.Errorf("expected to contain %q, got %q", s, got)
+				}
+			}
+			for _, s := range tc.wantNot {
+				if strings.Contains(got, s) {
+					t.Errorf("should not contain %q, got %q", s, got)
+				}
+			}
+		})
+	}
+}
+
+// ── Treasure Rank Ordering ─────────────────────────────────────────────────
+
+func TestAdvTreasureRank_Ordering(t *testing.T) {
+	t5 := &AdvTreasureDef{Key: "a", Tier: 5, Bonuses: []advTreasureBonusDef{{Type: "all_skills", Value: 5}}}
+	t3multi := &AdvTreasureDef{Key: "b", Tier: 3, Bonuses: []advTreasureBonusDef{
+		{Type: "combat_level", Value: 1}, {Type: "death_chance", Value: -1},
+	}}
+	t3single := &AdvTreasureDef{Key: "c", Tier: 3, Bonuses: []advTreasureBonusDef{{Type: "loot_quality", Value: 5}}}
+	t3same := &AdvTreasureDef{Key: "d", Tier: 3, Bonuses: []advTreasureBonusDef{{Type: "loot_quality", Value: 5}}}
+
+	if !advTreasureRankBetter(advTreasureRank(t5), advTreasureRank(t3multi)) {
+		t.Error("T5 should beat T3 regardless of bonus count")
+	}
+	if !advTreasureRankBetter(advTreasureRank(t3multi), advTreasureRank(t3single)) {
+		t.Error("equal tier: more bonuses should win")
+	}
+	if advTreasureRankBetter(advTreasureRank(t3single), advTreasureRank(t3same)) {
+		t.Error("equal tier and bonus count: should NOT be strictly better (no churn)")
+	}
+	if advTreasureRankBetter(advTreasureRank(t3same), advTreasureRank(t3single)) {
+		t.Error("equal tier and bonus count, reversed: also not strictly better")
+	}
+}
+
+func TestAdvTreasureIrreplaceable(t *testing.T) {
+	special := &AdvTreasureDef{Bonuses: []advTreasureBonusDef{{Type: "special_respawn_halve", Value: 1}}}
+	mixed := &AdvTreasureDef{Bonuses: []advTreasureBonusDef{
+		{Type: "all_skills", Value: 5}, {Type: "special_monthly_death_bypass", Value: 1},
+	}}
+	regular := &AdvTreasureDef{Bonuses: []advTreasureBonusDef{{Type: "loot_quality", Value: 10}}}
+	none := &AdvTreasureDef{}
+
+	if !advTreasureIrreplaceable(special) {
+		t.Error("special_* bonus should mark irreplaceable")
+	}
+	if !advTreasureIrreplaceable(mixed) {
+		t.Error("any special_* among bonuses should mark irreplaceable")
+	}
+	if advTreasureIrreplaceable(regular) {
+		t.Error("regular bonuses should not be irreplaceable")
+	}
+	if advTreasureIrreplaceable(none) {
+		t.Error("zero bonuses is not irreplaceable")
+	}
+	if advTreasureIrreplaceable(nil) {
+		t.Error("nil should not be irreplaceable")
+	}
+}
+
+// ── Crafting Teaser Boundaries ─────────────────────────────────────────────
+
+func TestRenderCraftingTeaser_BracketBoundaries(t *testing.T) {
+	cases := []struct {
+		name             string
+		foraging         int
+		craftsSucceeded  int
+		wantEmpty        bool
+		wantContainsAny  []string // any of these (OR)
+		wantNotContains  []string
+	}{
+		{"foraging 6 — out of pre-window", 6, 0, true, nil, nil},
+		{"foraging 7 — pre-unlock with 3 levels left, plural", 7, 0, false, []string{"3 Foraging level"}, []string{"unlocks in 1 ", "unlocks in 0"}},
+		{"foraging 9 — pre-unlock with 1 level, singular", 9, 0, false, []string{"1 Foraging level"}, []string{"levels"}},
+		{"foraging 10, no crafts yet — unlocked nudge", 10, 0, false, []string{"Crafting is unlocked"}, []string{"unlocks in"}},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := craftingTeaserText(tc.foraging, tc.craftsSucceeded, "")
+			if tc.wantEmpty {
+				if got != "" {
+					t.Errorf("expected empty, got %q", got)
+				}
+				return
+			}
+			if got == "" {
+				t.Fatalf("expected non-empty teaser, got empty")
+			}
+			for _, s := range tc.wantContainsAny {
+				if strings.Contains(got, s) {
+					goto matched
+				}
+			}
+			t.Errorf("expected any of %v, got %q", tc.wantContainsAny, got)
+		matched:
+			for _, bad := range tc.wantNotContains {
+				if strings.Contains(got, bad) {
+					t.Errorf("output should not contain %q, got %q", bad, got)
+				}
+			}
+		})
+	}
+}
+
+func TestCraftingReminderWeekday_Spread(t *testing.T) {
+	// Across many synthetic users in the same week, the per-player weekday
+	// should land on most weekdays (uniform-ish hash). Asserting "≥ 4 of 7"
+	// is a loose sanity check that catches a constant or pathological hash.
+	now := time.Date(2026, 5, 4, 12, 0, 0, 0, time.UTC)
+	hits := map[int]bool{}
+	for i := 0; i < 100; i++ {
+		uid := id.UserID(strings.Repeat("a", i+1) + "@test:local")
+		hits[craftingReminderWeekday(uid, now)] = true
+	}
+	if len(hits) < 5 {
+		t.Errorf("expected weekday spread across most days, only hit %d distinct: %v", len(hits), hits)
+	}
+}
+
+func TestCraftingReminderWeekday_StableWithinWeek(t *testing.T) {
+	uid := id.UserID("@stable:test")
+	mon := time.Date(2026, 5, 4, 0, 0, 0, 0, time.UTC) // Monday
+	sun := time.Date(2026, 5, 10, 23, 0, 0, 0, time.UTC) // Sunday same ISO week
+	if craftingReminderWeekday(uid, mon) != craftingReminderWeekday(uid, sun) {
+		t.Error("weekday should be stable within an ISO week")
+	}
+	// Following ISO week — should differ for at least *some* users; not
+	// guaranteed for every user but we test the rotation property exists.
+	nextWeek := time.Date(2026, 5, 11, 0, 0, 0, 0, time.UTC)
+	differs := 0
+	for i := 0; i < 50; i++ {
+		u := id.UserID(strings.Repeat("u", i+1) + "@x")
+		if craftingReminderWeekday(u, mon) != craftingReminderWeekday(u, nextWeek) {
+			differs++
+		}
+	}
+	if differs == 0 {
+		t.Error("expected the per-week hash to rotate at least some users between weeks")
+	}
+}
+
+// ── Location Risk/Reward Numbers ───────────────────────────────────────────
+
+func TestCalculateAdvProbabilities_RiskReward_NormalizesAcrossConfigs(t *testing.T) {
+	// Risk/reward render line depends on these probabilities. Lock in that
+	// they normalize to 100 across a few realistic configurations beyond
+	// the existing single-config sum test.
+	cases := []struct {
+		name string
+		char *AdventureCharacter
+		loc  *AdvLocation
+	}{
+		{"low-tier with low skill", &AdventureCharacter{ForagingSkill: 3},
+			&AdvLocation{Activity: AdvActivityForaging, Tier: 1, BaseDeathPct: 5, EmptyPct: 30}},
+		{"high-tier with high skill", &AdventureCharacter{ForagingSkill: 30},
+			&AdvLocation{Activity: AdvActivityForaging, Tier: 4, BaseDeathPct: 25, EmptyPct: 20}},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			equip := map[EquipmentSlot]*AdvEquipment{
+				SlotTool: {Tier: 3, Condition: 100},
+			}
+			probs := calculateAdvProbabilities(tc.char, equip, tc.loc, &AdvBonusSummary{}, false)
+			total := probs.DeathPct + probs.EmptyPct + probs.SuccessPct + probs.ExceptionalPct
+			if total < 99.99 || total > 100.01 {
+				t.Errorf("probabilities should sum to 100, got %.2f (%+v)", total, probs)
+			}
+			if probs.DeathPct < 0 || probs.ExceptionalPct < 0 {
+				t.Errorf("negative probability: %+v", probs)
+			}
+		})
+	}
+}

internal/plugin/adventure_holidays_test.go

@@ -258,9 +258,9 @@ func TestFixedHolidays_NoDuplicateMonthDay(t *testing.T) {
 
 func TestDailySummary_HolidayBlock(t *testing.T) {
 	players := []AdvPlayerDaySummary{
-		{DisplayName: "Alice", Activity: "dungeon", Location: "Cellar", Outcome: "success", LootValue: 500, HolidayActions: 2},
-		{DisplayName: "Bob", Activity: "mine", Location: "Quarry", Outcome: "success", LootValue: 300, HolidayActions: 1},
-		{DisplayName: "Carol", IsDead: true, DeadUntil: "14:00 UTC", Activity: "dungeon", Location: "Cave", Outcome: "death", HolidayActions: 1},
+		{DisplayName: "Alice", Activity: "dungeon", Location: "Cellar", Outcome: "success", LootValue: 500},
+		{DisplayName: "Bob", Activity: "mine", Location: "Quarry", Outcome: "success", LootValue: 300},
+		{DisplayName: "Carol", IsDead: true, DeadUntil: "14:00 UTC", Activity: "dungeon", Location: "Cave", Outcome: "death"},
 	}
 
 	text := renderAdvDailySummary("2026-12-25", nil, TwinBeeRewardSummary{}, players, "Christmas")
@@ -268,17 +268,19 @@ func TestDailySummary_HolidayBlock(t *testing.T) {
 	if !strings.Contains(text, "Christmas") {
 		t.Error("summary should contain holiday name")
 	}
-	if !strings.Contains(text, "two actions today") {
-		t.Error("summary should mention two actions on holidays")
+	// Adv 2.0 — holiday recap now advertises the +5 mood / free pack /
+	// +1 yield perks instead of the retired double-action mechanic.
+	if !strings.Contains(text, "TwinBee's blessing") {
+		t.Error("summary should mention TwinBee's blessing on holidays")
 	}
-	if !strings.Contains(text, "before their second action") {
-		t.Error("summary should note Carol died before second action")
+	if !strings.Contains(text, "free standard pack") {
+		t.Error("summary should mention the complimentary standard pack")
 	}
 
 	// Without holiday
 	textNoHol := renderAdvDailySummary("2026-12-26", nil, TwinBeeRewardSummary{}, players, "")
-	if strings.Contains(textNoHol, "two actions") {
-		t.Error("non-holiday summary should NOT mention two actions")
+	if strings.Contains(textNoHol, "TwinBee's blessing") {
+		t.Error("non-holiday summary should NOT mention TwinBee's blessing")
 	}
 }
 

internal/plugin/adventure_hospital.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log/slog"
 	"math"
+	"math/rand/v2"
 	"strings"
 	"time"
 
@@ -13,7 +14,56 @@ import (
 // ── Pending Interaction Types ──────────────────────────────────────────────
 
 type advPendingHospitalPay struct {
-	Cost int64 // after-insurance amount (recomputed at confirm time for TOCTOU safety)
+	Cost       int64 // after-insurance amount (recomputed at confirm time for TOCTOU safety)
+	Discounted bool  // pinned haggle outcome — when true, recomputed base is halved
+	Waived     bool  // pinned nat-20 outcome — full waiver, no debit
+}
+
+// hospitalCostsForUser returns (beforeInsurance, afterInsurance) for the
+// hospital revival bill. `Level × 5_000` after insurance, 5× that before.
+// Floors at level 1.
+func hospitalCostsForUser(char *AdventureCharacter) (int64, int64) {
+	level := 1
+	if dnd, err := LoadDnDCharacter(char.UserID); err == nil && dnd != nil && dnd.Level > 0 {
+		level = dnd.Level
+	}
+	after := int64(level) * 5_000
+	before := after * 5
+	return before, after
+}
+
+// hospitalHaggleDC is the target for the CHA-based haggle check. Pass = 50% off.
+const hospitalHaggleDC = 15
+
+type hospitalHaggleOutcome int
+
+const (
+	haggleFumble hospitalHaggleOutcome = iota // nat 1 — auto-fail, full price
+	haggleFail                                // d20+CHA < 15
+	haggleWin                                 // d20+CHA ≥ 15
+	haggleCrit                                // nat 20 — bill waived
+)
+
+// rollHospitalHaggle rolls d20 + CHA modifier vs DC 15. Returns the raw roll,
+// the CHA modifier, and the outcome. Nat 1 is an auto-fumble (full price);
+// nat 20 is an auto-crit (full waiver) regardless of modifier.
+// Falls back to 0 mod if the DnD row can't be loaded.
+func rollHospitalHaggle(userID id.UserID) (int, int, hospitalHaggleOutcome) {
+	mod := 0
+	if dnd, err := LoadDnDCharacter(userID); err == nil && dnd != nil {
+		mod = abilityModifier(dnd.CHA)
+	}
+	r := rand.IntN(20) + 1
+	switch {
+	case r == 20:
+		return r, mod, haggleCrit
+	case r == 1:
+		return r, mod, haggleFumble
+	case r+mod >= hospitalHaggleDC:
+		return r, mod, haggleWin
+	default:
+		return r, mod, haggleFail
+	}
 }
 
 // ── Hospital Command ───────────────────────────────────────────────────────
@@ -38,12 +88,28 @@ func (p *AdventurePlugin) handleHospitalCmd(ctx MessageContext) error {
 			slog.Error("hospital: on-demand revive failed", "user", char.UserID, "err", err)
 			return p.SendDM(ctx.Sender, "Something went wrong at the hospital. Try again in a moment.")
 		}
+		if dnd, err := LoadDnDCharacter(char.UserID); err == nil && dnd != nil {
+			dnd.HPCurrent = dnd.HPMax
+			if err := SaveDnDCharacter(dnd); err != nil {
+				slog.Error("hospital: failed to restore DnDCharacter HP on natural revive", "user", char.UserID, "err", err)
+			}
+		}
 		return p.SendDM(ctx.Sender, nurseJoyAlreadyRevived)
 	}
 
-	// Compute costs
-	beforeInsurance := int64(char.CombatLevel) * 125_000
-	afterInsurance := int64(char.CombatLevel) * 25_000
+	// Compute costs (level × 5k after insurance, 5× before)
+	beforeInsurance, baseAfterInsurance := hospitalCostsForUser(char)
+
+	// Haggle: CHA save vs DC 15. Nat 20 waives the bill, nat 1 is auto-full,
+	// otherwise pass = half off.
+	haggleRoll, haggleMod, haggleOutcome := rollHospitalHaggle(ctx.Sender)
+	afterInsurance := baseAfterInsurance
+	switch haggleOutcome {
+	case haggleCrit:
+		afterInsurance = 0
+	case haggleWin:
+		afterInsurance /= 2
+	}
 
 	// Check balance
 	balance := p.euro.GetBalance(ctx.Sender)
@@ -55,7 +121,8 @@ func (p *AdventurePlugin) handleHospitalCmd(ctx MessageContext) error {
 		// Room announcement
 		gr := gamesRoom()
 		if gr != "" {
-			p.SendMessage(gr, fmt.Sprintf(hospitalDitchAnnounce, char.DisplayName))
+			name, _ := loadDisplayName(char.UserID)
+			p.SendMessage(gr, fmt.Sprintf(hospitalDitchAnnounce, name))
 		}
 		return nil
 	}
@@ -66,8 +133,12 @@ func (p *AdventurePlugin) handleHospitalCmd(ctx MessageContext) error {
 	// Build the full multi-act DM
 	var sb strings.Builder
 
+	// Phase L4a: HospitalVisits sourced from player_meta (with AdvCharacter
+	// fallback during soak).
+	visits, _ := loadHospitalVisits(char.UserID)
+
 	// Act 1 — Admission
-	if char.HospitalVisits == 0 {
+	if visits == 0 {
 		sb.WriteString(nurseJoyFirstVisit)
 	}
 
@@ -75,29 +146,61 @@ func (p *AdventurePlugin) handleHospitalCmd(ctx MessageContext) error {
 	sb.WriteString(admission)
 	sb.WriteString("\n\n")
 
-	// Act 2 — The Bill
-	sb.WriteString(generateItemizedBill(beforeInsurance, afterInsurance, char.HospitalVisits, isHol))
+	// Act 2 — The Bill (always shows the un-haggled after-insurance figure;
+	// the haggle adjustment is announced separately below).
+	sb.WriteString(generateItemizedBill(beforeInsurance, baseAfterInsurance, visits, isHol))
 	sb.WriteString("\n\n")
 
 	delivery, _ := advPickFlavor(nurseJoyBillDelivery, ctx.Sender, "hospital_delivery")
 	sb.WriteString(delivery)
 	sb.WriteString("\n\n───\n\n")
 
-	// Act 3 — After Insurance
+	// Act 3 — After Insurance (pre-haggle figure)
 	afterText, _ := advPickFlavor(nurseJoyAfterInsurance, ctx.Sender, "hospital_after")
 	// Some entries have two %d placeholders (she says the number twice)
 	count := strings.Count(afterText, "%d")
 	switch count {
 	case 1:
-		afterText = fmt.Sprintf(afterText, afterInsurance)
+		afterText = fmt.Sprintf(afterText, baseAfterInsurance)
 	case 2:
-		afterText = fmt.Sprintf(afterText, afterInsurance, afterInsurance)
+		afterText = fmt.Sprintf(afterText, baseAfterInsurance, baseAfterInsurance)
 	}
 	sb.WriteString(afterText)
-	sb.WriteString("\n\n")
+	sb.WriteString("\n\n───\n\n")
 
-	// Payment prompt
-	sb.WriteString(fmt.Sprintf("**St. Guildmore's Memorial Hospital**\nAmount due: **%s**\n\n", fmtEuro(afterInsurance)))
+	// Act 4 — The Haggle. Nurse Joy lets you make a charisma save on your bill.
+	total := haggleRoll + haggleMod
+	flavor, _ := advPickFlavor(nurseJoyHaggleFlavor[haggleOutcome], ctx.Sender, fmt.Sprintf("hospital_haggle_%d", haggleOutcome))
+	var verdict string
+	switch haggleOutcome {
+	case haggleCrit:
+		verdict = "🎉 **NAT 20 — bill waived!**"
+	case haggleWin:
+		verdict = "✅ *Passed!* The bill is halved."
+	case haggleFumble:
+		verdict = "💀 **NAT 1 — auto-fail.** Full price stands."
+	default:
+		verdict = "❌ *Failed.* Full price stands."
+	}
+	sb.WriteString(fmt.Sprintf(
+		"🎲 **Haggle Check (CHA DC %d)**\n"+
+			"You attempt to charm Nurse Joy into a discount...\n"+
+			"d20 = **%d**, CHA mod %+d → **total %d** vs DC %d\n"+
+			"%s\n\n%s\n\n───\n\n",
+		hospitalHaggleDC, haggleRoll, haggleMod, total, hospitalHaggleDC, verdict, flavor))
+
+	// Payment prompt — show base → final adjustment when it changed.
+	sb.WriteString("**St. Guildmore's Memorial Hospital**\n")
+	switch haggleOutcome {
+	case haggleCrit:
+		sb.WriteString(fmt.Sprintf("Original: ~~%s~~ → **WAIVED**\n", fmtEuro(baseAfterInsurance)))
+		sb.WriteString("Amount due: **€0**\n\n")
+	case haggleWin:
+		sb.WriteString(fmt.Sprintf("Original: ~~%s~~ → **%s** (haggled)\n", fmtEuro(baseAfterInsurance), fmtEuro(afterInsurance)))
+		sb.WriteString(fmt.Sprintf("Amount due: **%s**\n\n", fmtEuro(afterInsurance)))
+	default:
+		sb.WriteString(fmt.Sprintf("Amount due: **%s**\n\n", fmtEuro(afterInsurance)))
+	}
 	sb.WriteString("Pay now? (yes / no)\n\n")
 	sb.WriteString("*Note: Declining payment will result in discharge to the natural respawn queue. " +
 		"You'll be back tomorrow. The chair in the waiting room is available in the meantime.*")
@@ -105,7 +208,11 @@ func (p *AdventurePlugin) handleHospitalCmd(ctx MessageContext) error {
 	// Store pending interaction
 	p.pending.Store(string(ctx.Sender), &advPendingInteraction{
 		Type:      "hospital_pay",
-		Data:      &advPendingHospitalPay{Cost: afterInsurance},
+		Data: &advPendingHospitalPay{
+			Cost:       afterInsurance,
+			Discounted: haggleOutcome == haggleWin,
+			Waived:     haggleOutcome == haggleCrit,
+		},
 		ExpiresAt: time.Now().Add(advDMResponseWindow),
 	})
 	p.advMarkMenuSent(ctx.Sender)
@@ -138,11 +245,28 @@ func (p *AdventurePlugin) resolveHospitalPay(ctx MessageContext, interaction *ad
 			char.Alive = true
 			char.DeadUntil = nil
 			_ = saveAdvCharacter(char)
+			if dnd, err := LoadDnDCharacter(char.UserID); err == nil && dnd != nil {
+				dnd.HPCurrent = dnd.HPMax
+				_ = SaveDnDCharacter(dnd)
+			}
 			return p.SendDM(ctx.Sender, nurseJoyAlreadyRevived)
 		}
 
-		// Recompute cost from current combat level (don't trust cached value)
-		cost := int64(char.CombatLevel) * 25_000
+		// Recompute cost from current DnD level (don't trust cached value).
+		// The haggle outcome was pinned at prompt time — re-applying it here
+		// preserves the discount even if level changed mid-flow, and prevents
+		// any reroll exploit.
+		_, cost := hospitalCostsForUser(char)
+		waived := false
+		if pay, ok := interaction.Data.(*advPendingHospitalPay); ok {
+			switch {
+			case pay.Waived:
+				cost = 0
+				waived = true
+			case pay.Discounted:
+				cost /= 2
+			}
+		}
 
 		// Check balance
 		balance := p.euro.GetBalance(ctx.Sender)
@@ -152,46 +276,68 @@ func (p *AdventurePlugin) resolveHospitalPay(ctx MessageContext, interaction *ad
 
 			gr := gamesRoom()
 			if gr != "" {
-				p.SendMessage(gr, fmt.Sprintf(hospitalDitchAnnounce, char.DisplayName))
+				name, _ := loadDisplayName(char.UserID)
+			p.SendMessage(gr, fmt.Sprintf(hospitalDitchAnnounce, name))
 			}
 			return nil
 		}
 
-		// Debit
-		if !p.euro.Debit(ctx.Sender, float64(cost), "hospital_revival") {
-			text, _ := advPickFlavor(nurseJoyCantAfford, ctx.Sender, "hospital_broke")
-			return p.SendDM(ctx.Sender, text)
+		// Debit (skipped on a nat-20 waiver)
+		if !waived {
+			if !p.euro.Debit(ctx.Sender, float64(cost), "hospital_revival") {
+				text, _ := advPickFlavor(nurseJoyCantAfford, ctx.Sender, "hospital_broke")
+				return p.SendDM(ctx.Sender, text)
+			}
+
+			// Community health fund: 10% of revival cost.
+			if potCut := int(math.Round(float64(cost) * 0.1)); potCut > 0 {
+				communityPotAdd(potCut)
+				trackTaxPaid(ctx.Sender, potCut)
+			}
 		}
 
-		// Community health fund: 10% of revival cost.
-		if potCut := int(math.Round(float64(cost) * 0.1)); potCut > 0 {
-			communityPotAdd(potCut)
-			trackTaxPaid(ctx.Sender, potCut)
-		}
-
-		// Revive
+		// Revive. Restore DnDCharacter HP to full (canonical post-L5 path);
+		// AdvCharacter.Alive flip + HospitalVisits++ propagate through the
+		// saveAdvCharacter fan-out into player_meta.
 		char.Alive = true
 		char.DeadUntil = nil
 		char.HospitalVisits++
 		if err := saveAdvCharacter(char); err != nil {
 			slog.Error("hospital: failed to save character after revival", "user", char.UserID, "err", err)
-			// Refund on save failure
-			p.euro.Credit(ctx.Sender, float64(cost), "hospital_revival_refund")
+			// Refund on save failure (no-op when nothing was debited)
+			if !waived {
+				p.euro.Credit(ctx.Sender, float64(cost), "hospital_revival_refund")
+			}
 			return p.SendDM(ctx.Sender, "Something went wrong during recovery. Your payment has been refunded.")
 		}
+		if dnd, err := LoadDnDCharacter(char.UserID); err == nil && dnd != nil {
+			dnd.HPCurrent = dnd.HPMax
+			if err := SaveDnDCharacter(dnd); err != nil {
+				slog.Error("hospital: failed to restore DnDCharacter HP", "user", char.UserID, "err", err)
+			}
+		}
 
 		// Discharge DM
-		p.SendDM(ctx.Sender, fmt.Sprintf(
-			"✅ **Discharged — you're alive!**\n\n"+
-				"%s deducted. Nurse Joy wishes you the best. "+
-				"She means it. She always means it.\n\n"+
-				"Go get 'em. Type `!adventure` when you're ready.",
-			fmtEuro(cost)))
+		if waived {
+			p.SendDM(ctx.Sender, "✅ **Discharged — you're alive!**\n\n"+
+				"Nurse Joy waved the deductible entirely. _\"On the house, sweetie. "+
+				"You earned it.\"_ Derek the billing orderly looks personally offended.\n\n"+
+				"Go get 'em. Type `!adventure` when you're ready.")
+		} else {
+			p.SendDM(ctx.Sender, fmt.Sprintf(
+				"✅ **Discharged — you're alive!**\n\n"+
+					"%s deducted. Nurse Joy wishes you the best. "+
+					"She means it. She always means it.\n\n"+
+					"Go get 'em. Type `!adventure` when you're ready.",
+				fmtEuro(cost)))
+		}
 
 		// Room announcement
 		gr := gamesRoom()
 		if gr != "" {
-			p.SendMessage(gr, fmt.Sprintf(hospitalDischargeAnnounce, char.DisplayName))
+			name, _ := loadDisplayName(char.UserID)
+			descriptor, _ := advPickFlavor(hospitalDischargeBillDescriptors, ctx.Sender, "hospital_discharge_bill")
+			p.SendMessage(gr, fmt.Sprintf(hospitalDischargeAnnouncePrefix, name, descriptor))
 		}
 
 		return nil
@@ -206,7 +352,8 @@ func (p *AdventurePlugin) resolveHospitalPay(ctx MessageContext, interaction *ad
 	if err == nil {
 		gr := gamesRoom()
 		if gr != "" {
-			p.SendMessage(gr, fmt.Sprintf(hospitalDitchAnnounce, char.DisplayName))
+			name, _ := loadDisplayName(char.UserID)
+			p.SendMessage(gr, fmt.Sprintf(hospitalDitchAnnounce, name))
 		}
 	}
 
@@ -216,8 +363,7 @@ func (p *AdventurePlugin) resolveHospitalPay(ctx MessageContext, interaction *ad
 // ── Hospital Ad (sent after death) ─────────────────────────────────────────
 
 func (p *AdventurePlugin) sendHospitalAd(userID id.UserID, char *AdventureCharacter) {
-	beforeInsurance := int64(char.CombatLevel) * 125_000
-	afterInsurance := int64(char.CombatLevel) * 25_000
+	beforeInsurance, afterInsurance := hospitalCostsForUser(char)
 	respawnTime := "unknown"
 	if char.DeadUntil != nil {
 		respawnTime = char.DeadUntil.Format("15:04")
@@ -248,36 +394,41 @@ func (p *AdventurePlugin) hospitalNudgeTicker() {
 	ticker := time.NewTicker(1 * time.Minute)
 	defer ticker.Stop()
 
-	for range ticker.C {
-		now := time.Now().UTC()
-		p.hospitalNudges.Range(func(key, val any) bool {
-			uid := key.(string)
-			nudgeAt := val.(time.Time)
-			if now.Before(nudgeAt) {
-				return true
-			}
-
-			// Due — remove regardless of outcome
-			p.hospitalNudges.Delete(uid)
-
-			userID := id.UserID(uid)
-			char, err := loadAdvCharacter(userID)
-			if err != nil || char.Alive {
-				return true
-			}
-
-			// Don't nudge if already in hospital flow
-			if v, ok := p.pending.Load(uid); ok {
-				if pi, ok := v.(*advPendingInteraction); ok && pi.Type == "hospital_pay" {
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			now := time.Now().UTC()
+			p.hospitalNudges.Range(func(key, val any) bool {
+				uid := key.(string)
+				nudgeAt := val.(time.Time)
+				if now.Before(nudgeAt) {
 					return true
 				}
-			}
 
-			text, _ := advPickFlavor(nurseJoyNudge, userID, "hospital_nudge")
-			if err := p.SendDM(userID, text); err != nil {
-				slog.Error("hospital: failed to send nudge", "user", userID, "err", err)
-			}
-			return true
-		})
+				// Due — remove regardless of outcome
+				p.hospitalNudges.Delete(uid)
+
+				userID := id.UserID(uid)
+				char, err := loadAdvCharacter(userID)
+				if err != nil || char.Alive {
+					return true
+				}
+
+				// Don't nudge if already in hospital flow
+				if v, ok := p.pending.Load(uid); ok {
+					if pi, ok := v.(*advPendingInteraction); ok && pi.Type == "hospital_pay" {
+						return true
+					}
+				}
+
+				text, _ := advPickFlavor(nurseJoyNudge, userID, "hospital_nudge")
+				if err := p.SendDM(userID, text); err != nil {
+					slog.Error("hospital: failed to send nudge", "user", userID, "err", err)
+				}
+				return true
+			})
+		}
 	}
 }

internal/plugin/adventure_masterwork.go

@@ -158,7 +158,7 @@ func masterworkDropFlavorText(activity AdvActivityType, tier int) string {
 
 // ── Drop Logic ─────────────────────────────────────────────────────────────
 
-func (p *AdventurePlugin) checkMasterworkDrop(userID id.UserID, char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, loc *AdvLocation, outcome AdvOutcomeType) {
+func (p *AdventurePlugin) checkMasterworkDrop(userID id.UserID, equip map[EquipmentSlot]*AdvEquipment, loc *AdvLocation, outcome AdvOutcomeType) {
 	// Only full-success outcomes drop masterwork (success or exceptional)
 	if outcome != AdvOutcomeSuccess && outcome != AdvOutcomeExceptional {
 		return
@@ -193,11 +193,18 @@ func (p *AdventurePlugin) checkMasterworkDrop(userID id.UserID, char *AdventureC
 		autoEquip = true // genuinely better than what they have
 	}
 
-	// First-drop detection
-	isFirstDrop := char.MasterworkDropsReceived == 0
-	char.MasterworkDropsReceived++
-	if err := saveAdvCharacter(char); err != nil {
-		slog.Error("adventure: failed to save masterwork counter", "user", userID, "err", err)
+	// First-drop detection. Counter persists via saveAdvCharacter fan-out.
+	priorDrops, err := loadMasterworkDrops(userID)
+	if err != nil {
+		slog.Error("adventure: failed to load masterwork counter", "user", userID, "err", err)
+	}
+	isFirstDrop := priorDrops == 0
+	newDrops := priorDrops + 1
+	if char, lerr := loadAdvCharacter(userID); lerr == nil {
+		char.MasterworkDropsReceived = newDrops
+		if err := saveAdvCharacter(char); err != nil {
+			slog.Error("adventure: failed to save masterwork counter", "user", userID, "err", err)
+		}
 	}
 
 	if autoEquip {
@@ -262,7 +269,8 @@ func (p *AdventurePlugin) checkMasterworkDrop(userID id.UserID, char *AdventureC
 	p.SendDM(userID, sb.String())
 
 	// Room announcement (tiered)
-	p.postMasterworkAnnouncement(char.DisplayName, def, loc.Name)
+	displayName, _ := loadDisplayName(userID)
+	p.postMasterworkAnnouncement(displayName, def, loc.Name)
 }
 
 // ── Room Announcements ─────────────────────────────────────────────────────

internal/plugin/adventure_mortgage.go

@@ -107,35 +107,40 @@ func (p *AdventurePlugin) mortgageTicker() {
 	ticker := time.NewTicker(1 * time.Hour)
 	defer ticker.Stop()
 
-	for range ticker.C {
-		now := time.Now().UTC()
-		// Run on Mondays only (FRED updates Thursdays, we process Mondays)
-		if now.Weekday() != time.Monday {
-			continue
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			now := time.Now().UTC()
+			// Run on Mondays only (FRED updates Thursdays, we process Mondays)
+			if now.Weekday() != time.Monday {
+				continue
+			}
+
+			_, week := now.ISOWeek()
+			dateKey := fmt.Sprintf("%d-W%02d", now.Year(), week)
+			jobName := "mortgage_weekly"
+			if db.JobCompleted(jobName, dateKey) {
+				continue
+			}
+
+			slog.Info("mortgage: running weekly payment processing")
+
+			// Fetch fresh rate and compare with previous
+			newRate := getCurrentMortgageRate()
+			oldRate := p.getLastKnownRate()
+
+			if oldRate > 0 && oldRate != newRate {
+				p.sendMortgageRateChangeDMs(oldRate, newRate)
+			}
+			p.setLastKnownRate(newRate)
+
+			// Process payments
+			p.processMortgagePayments()
+
+			db.MarkJobCompleted(jobName, dateKey)
 		}
-
-		_, week := now.ISOWeek()
-		dateKey := fmt.Sprintf("%d-W%02d", now.Year(), week)
-		jobName := "mortgage_weekly"
-		if db.JobCompleted(jobName, dateKey) {
-			continue
-		}
-
-		slog.Info("mortgage: running weekly payment processing")
-
-		// Fetch fresh rate and compare with previous
-		newRate := getCurrentMortgageRate()
-		oldRate := p.getLastKnownRate()
-
-		if oldRate > 0 && oldRate != newRate {
-			p.sendMortgageRateChangeDMs(oldRate, newRate)
-		}
-		p.setLastKnownRate(newRate)
-
-		// Process payments
-		p.processMortgagePayments()
-
-		db.MarkJobCompleted(jobName, dateKey)
 	}
 }
 

internal/plugin/adventure_npcs.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"gogobee/internal/db"
+	"gogobee/internal/flavor"
 
 	"maunium.net/go/mautrix/id"
 )
@@ -85,6 +86,9 @@ func (p *AdventurePlugin) npcTrackMessage(userID id.UserID) {
 	if err := saveAdvCharacter(char); err != nil {
 		slog.Error("npc: failed to save msg count", "user", userID, "err", err)
 	}
+	if err := upsertPlayerMetaNPCState(userID, npcStateFromAdvChar(char)); err != nil {
+		slog.Error("player_meta: npc msg count dual-write failed", "user", userID, "err", err)
+	}
 
 	// Release lock BEFORE firing encounter (npcFireEncounter re-acquires it)
 	userMu.Unlock()
@@ -134,12 +138,15 @@ func (p *AdventurePlugin) npcFireEncounter(userID id.UserID, npc string) {
 	case "misty":
 		char.MistyLastSeen = &now
 		char.MistyEncounterCount++
-		opening = mistyOpenings[rand.IntN(len(mistyOpenings))]
+		// Pool union: legacy mistyOpenings + D&D MistyGreeting flavor.
+		mistyPool := dndMistyGreetingPool()
+		opening = mistyPool[rand.IntN(len(mistyPool))]
 		prompt = fmt.Sprintf("👤 A woman approaches you.\n\n_%s_\n\n"+
 			"Reply `yes` to give €%d, or `no` to walk away.", opening, mistyCost)
 	case "arina":
 		char.ArinaLastSeen = &now
-		opening = arinaOpenings[rand.IntN(len(arinaOpenings))]
+		arinaPool := dndArinaGreetingPool()
+		opening = arinaPool[rand.IntN(len(arinaPool))]
 		prompt = fmt.Sprintf("💎 A woman in expensive clothing stops you.\n\n_%s_\n\n"+
 			"Reply `yes` to pay €%d, or `no` to decline.", opening, arinaCost)
 	}
@@ -148,6 +155,9 @@ func (p *AdventurePlugin) npcFireEncounter(userID id.UserID, npc string) {
 		slog.Error("npc: failed to save last_seen", "user", userID, "npc", npc, "err", err)
 		return
 	}
+	if err := upsertPlayerMetaNPCState(userID, npcStateFromAdvChar(char)); err != nil {
+		slog.Error("player_meta: npc last_seen dual-write failed", "user", userID, "npc", npc, "err", err)
+	}
 
 	// Don't overwrite an existing pending interaction (shop, treasure, etc.)
 	if _, occupied := p.pending.Load(string(userID)); occupied {
@@ -213,6 +223,7 @@ func (p *AdventurePlugin) resolveMisty(ctx MessageContext, char *AdventureCharac
 			if err := saveAdvCharacter(char); err != nil {
 				slog.Error("npc: failed to save misty debuff", "user", ctx.Sender, "err", err)
 			}
+			_ = upsertPlayerMetaNPCState(char.UserID, npcStateFromAdvChar(char))
 			return p.SendDM(ctx.Sender, "You reach for your gold but there isn't enough. She sees this. She doesn't say anything.\n\n_"+mistyDeclineLine+"_")
 		}
 
@@ -221,26 +232,50 @@ func (p *AdventurePlugin) resolveMisty(ctx MessageContext, char *AdventureCharac
 			if err := saveAdvCharacter(char); err != nil {
 				slog.Error("npc: failed to save misty debuff", "user", ctx.Sender, "err", err)
 			}
+			_ = upsertPlayerMetaNPCState(char.UserID, npcStateFromAdvChar(char))
 			return p.SendDM(ctx.Sender, "You reach for your gold but there isn't enough. She sees this. She doesn't say anything.\n\n_"+mistyDeclineLine+"_")
 		}
+		// D&D Insight check — passing refunds the donation. Renders flavor on
+		// either outcome (success or fail) when a check was attempted.
+		insightCheck := dndNPCInsightRefund(ctx.Sender, p.euro, mistyCost)
 		char.MistyBuffExpires = expires
 		char.MistyDonatedCount++
 
 		// Pet reactivation: donating to Misty after chasing pet away
-		mistyReactivatePet(char)
+		mistyPet, _ := loadPetState(char.UserID)
+		if mistyReactivatePet(mistyPet) {
+			char.PetReactivated = true
+		}
 
 		if err := saveAdvCharacter(char); err != nil {
 			slog.Error("npc: failed to save misty buff", "user", ctx.Sender, "err", err)
 		}
+		_ = upsertPlayerMetaPetState(char.UserID, petStateFromAdvChar(char))
+		_ = upsertPlayerMetaNPCState(char.UserID, npcStateFromAdvChar(char))
 
 		reply := mistyAcceptLines[rand.IntN(len(mistyAcceptLines))]
 
 		// Housing hint (fires once after 2+ encounters)
-		hint := mistyHousingHint(char)
+		mistyHouse, _ := loadHouseState(char.UserID)
+		hint := mistyHousingHint(char.MistyEncounterCount, char.MistyDonatedCount, mistyHouse)
 		if hint != "" {
 			reply += "\n\n_" + hint + "_"
 		}
 
+		// Flavor for the D&D check outcome (when applicable).
+		if insightCheck.Attempted {
+			if insightCheck.Succeeded {
+				if line := flavor.Pick(flavor.MistyInsightSuccess); line != "" {
+					reply += "\n\n_" + line + "_"
+				}
+				reply += "\n\n_(Insight DC 12 passed — donation refunded.)_"
+			} else {
+				if line := flavor.Pick(flavor.MistySkillFail); line != "" {
+					reply += "\n\n_" + line + "_"
+				}
+			}
+		}
+
 		return p.SendDM(ctx.Sender, fmt.Sprintf("_%s_", reply))
 	}
 
@@ -249,6 +284,7 @@ func (p *AdventurePlugin) resolveMisty(ctx MessageContext, char *AdventureCharac
 	if err := saveAdvCharacter(char); err != nil {
 		slog.Error("npc: failed to save misty debuff", "user", ctx.Sender, "err", err)
 	}
+	_ = upsertPlayerMetaNPCState(char.UserID, npcStateFromAdvChar(char))
 	return p.SendDM(ctx.Sender, fmt.Sprintf("_%s_", mistyDeclineLine))
 }
 
@@ -264,11 +300,29 @@ func (p *AdventurePlugin) resolveArina(ctx MessageContext, char *AdventureCharac
 			reply := arinaDeclineLines[rand.IntN(len(arinaDeclineLines))]
 			return p.SendDM(ctx.Sender, fmt.Sprintf("You can't afford it. She noticed before you did.\n\n_%s_", reply))
 		}
+		// D&D Arcana check — flavor for either outcome when a check was attempted.
+		arcanaCheck := dndNPCArcanaRefund(ctx.Sender, p.euro, arinaCost)
 		char.ArinaBuffExpires = expires
 		if err := saveAdvCharacter(char); err != nil {
 			slog.Error("npc: failed to save arina buff", "user", ctx.Sender, "err", err)
 		}
-		return p.SendDM(ctx.Sender, fmt.Sprintf("_%s_", arinaAcceptLine))
+		_ = upsertPlayerMetaNPCState(char.UserID, npcStateFromAdvChar(char))
+		extra := ""
+		if arcanaCheck.Attempted {
+			if arcanaCheck.Succeeded {
+				if line := flavor.Pick(flavor.ArinaArcanaSuccess); line != "" {
+					extra = "\n\n_" + line + "_"
+				}
+				extra += "\n\n_(Arcana DC 14 passed — investment refunded.)_"
+			} else {
+				if line := flavor.Pick(flavor.ArinaSkillFail); line != "" {
+					extra = "\n\n_" + line + "_"
+				}
+			}
+		}
+		return p.SendDM(ctx.Sender, fmt.Sprintf(
+			"_She snatches the money from you, almost rudely, then looks at you expectantly._\n\n\"%s\"\n\n_She walks away just as quickly as she came._%s",
+			arinaAcceptLine, extra))
 	}
 
 	// Declined — no mechanical effect, just insults
@@ -378,14 +432,13 @@ func npcRepairMostDamaged(userID id.UserID, equip map[EquipmentSlot]*AdvEquipmen
 func npcMidnightReset() {
 	d := db.Get()
 	today := time.Now().UTC().Format("2006-01-02")
-	_, err := d.Exec(`
-		UPDATE adventure_characters
+	if _, err := d.Exec(`
+		UPDATE player_meta
 		SET npc_msg_count = 0,
 		    npc_msg_count_date = ?,
 		    misty_roll_target = ABS(RANDOM()) % 6 + 5,
 		    arina_roll_target = ABS(RANDOM()) % 6 + 5`,
-		today)
-	if err != nil {
+		today); err != nil {
 		slog.Error("npc: midnight reset failed", "err", err)
 	}
 }

internal/plugin/adventure_pets.go

@@ -32,25 +32,25 @@ func petXPToNextLevel(level int) int {
 }
 
 // petGrantXP adds XP to the pet and handles level-ups. Returns true if leveled up.
-func petGrantXP(char *AdventureCharacter) bool {
-	if !char.HasPet() || char.PetLevel >= 10 {
+func petGrantXP(pet *PetState) bool {
+	if !pet.HasPet() || pet.Level >= 10 {
 		return false
 	}
 
-	char.PetXP += int(petXPPerAction * 100) // store as centixp for precision
+	pet.XP += int(petXPPerAction * 100) // store as centixp for precision
 	leveled := false
-	for char.PetLevel < 10 {
-		needed := petXPToNextLevel(char.PetLevel) * 100
-		if char.PetXP < needed {
+	for pet.Level < 10 {
+		needed := petXPToNextLevel(pet.Level) * 100
+		if pet.XP < needed {
 			break
 		}
-		char.PetXP -= needed
-		char.PetLevel++
+		pet.XP -= needed
+		pet.Level++
 		leveled = true
 	}
 
-	if char.PetLevel >= 10 && char.PetLevel10Date == "" {
-		char.PetLevel10Date = time.Now().UTC().Format("2006-01-02")
+	if pet.Level >= 10 && pet.Level10Date == "" {
+		pet.Level10Date = time.Now().UTC().Format("2006-01-02")
 	}
 
 	return leveled
@@ -108,19 +108,19 @@ type PetCombatResult struct {
 }
 
 // petRollCombatActions rolls attack and deflect for a combat round.
-func petRollCombatActions(char *AdventureCharacter, enemyName string) *PetCombatResult {
-	if !char.HasPet() {
+func petRollCombatActions(pet PetState, enemyName string) *PetCombatResult {
+	if !pet.HasPet() {
 		return nil
 	}
 
 	result := &PetCombatResult{}
 
 	// Attack roll
-	if rand.Float64() < petAttackChance(char.PetLevel) {
+	if rand.Float64() < petAttackChance(pet.Level) {
 		result.Attacked = true
-		result.AttackDamage = 3 + rand.IntN(5) + char.PetLevel // 3-7 + level
+		result.AttackDamage = 3 + rand.IntN(5) + pet.Level // 3-7 + level
 		var pool []string
-		if char.PetType == "dog" {
+		if pet.Type == "dog" {
 			pool = PetDogAttack
 		} else {
 			pool = PetCatAttack
@@ -132,10 +132,10 @@ func petRollCombatActions(char *AdventureCharacter, enemyName string) *PetCombat
 	}
 
 	// Deflect roll
-	if rand.Float64() < petDeflectChance(char.PetLevel, char.PetArmorTier) {
+	if rand.Float64() < petDeflectChance(pet.Level, pet.ArmorTier) {
 		result.Deflected = true
 		var pool []string
-		if char.PetType == "dog" {
+		if pet.Type == "dog" {
 			pool = PetDogDeflect
 		} else {
 			pool = PetCatDeflect
@@ -149,20 +149,20 @@ func petRollCombatActions(char *AdventureCharacter, enemyName string) *PetCombat
 }
 
 // petRollDitchRecovery rolls for pet intervention on player death.
-func petRollDitchRecovery(char *AdventureCharacter) bool {
-	if !char.HasPet() {
+func petRollDitchRecovery(pet PetState) bool {
+	if !pet.HasPet() {
 		return false
 	}
-	return rand.Float64() < petDitchRecoveryChance(char.PetLevel)
+	return rand.Float64() < petDitchRecoveryChance(pet.Level)
 }
 
 // petVictoryText returns a random victory reaction line.
-func petVictoryText(char *AdventureCharacter) string {
-	if !char.HasPet() {
+func petVictoryText(pet PetState) string {
+	if !pet.HasPet() {
 		return ""
 	}
 	var pool []string
-	if char.PetType == "dog" {
+	if pet.Type == "dog" {
 		pool = PetDogVictory
 	} else {
 		pool = PetCatVictory
@@ -171,12 +171,12 @@ func petVictoryText(char *AdventureCharacter) string {
 }
 
 // petDeathText returns a random death reaction line.
-func petDeathText(char *AdventureCharacter) string {
-	if !char.HasPet() {
+func petDeathText(pet PetState) string {
+	if !pet.HasPet() {
 		return ""
 	}
 	var pool []string
-	if char.PetType == "dog" {
+	if pet.Type == "dog" {
 		pool = PetDogDeath
 	} else {
 		pool = PetCatDeath
@@ -187,21 +187,42 @@ func petDeathText(char *AdventureCharacter) string {
 // ── Pet Arrival Flow ───────────────────────────────────────────────────────
 
 // petShouldArrive checks if pet arrival should trigger.
-// Fires randomly after Tier 1 house upgrade is complete.
-func petShouldArrive(char *AdventureCharacter) bool {
-	if char.PetArrived {
+// Fires randomly after Tier 1 house upgrade is complete. Housing and pet
+// state come from player_meta via loadHouseState / loadPetState (L4d/L4e
+// reader flip).
+func petShouldArrive(pet PetState, house HouseState) bool {
+	if pet.Arrived {
 		return false
 	}
 	// Pet arrives after Tier 1 (Livable) upgrade = HouseTier >= 2
-	if char.HouseTier < 2 {
+	if house.Tier < 2 {
 		return false
 	}
 	// Pet was chased away and reactivated via Misty — allow re-arrival
-	if char.PetChasedAway {
-		return char.PetReactivated
+	if pet.ChasedAway {
+		return pet.Reactivated
+	}
+	// 30% daily chance after house tier 1 (~3 days average to arrival)
+	return rand.Float64() < 0.30
+}
+
+// maybeRollPetArrivalOnEmerge rolls the pet-arrival check when a player
+// surfaces from an expedition (voluntary extract, abandon, or a survived
+// forced extraction) or revives after death. The arrival roll lives on the
+// emergence seam — not the legacy 08:00 overworld morning DM — because
+// expedition players are almost never in the overworld at the scheduled hour,
+// so the morning roll never reached them. Story beat: while the player was
+// underground, an animal wandered into the empty house looking for food.
+//
+// Safe to call unconditionally on any emergence: petShouldArrive gates on
+// house tier / not-yet-arrived, and petArrivalDM won't clobber an existing
+// pending interaction.
+func (p *AdventurePlugin) maybeRollPetArrivalOnEmerge(userID id.UserID) {
+	pet, _ := loadPetState(userID)
+	house, _ := loadHouseState(userID)
+	if petShouldArrive(pet, house) {
+		p.petArrivalDM(userID)
 	}
-	// 15% daily chance after house tier 1
-	return rand.Float64() < 0.15
 }
 
 // petArrivalDM sends the initial "there's an animal in your house" DM.
@@ -219,7 +240,7 @@ func (p *AdventurePlugin) petArrivalDM(userID id.UserID) {
 	p.pending.Store(string(userID), &advPendingInteraction{
 		Type:      "pet_arrival",
 		Data:      &advPendingPetArrival{},
-		ExpiresAt: time.Now().Add(advDMResponseWindow),
+		ExpiresAt: time.Now().Add(advDMResponseWindowLow),
 	})
 	_ = p.SendDM(userID, text)
 }
@@ -241,6 +262,7 @@ func (p *AdventurePlugin) resolvePetArrival(ctx MessageContext) error {
 		char.PetChasedAway = true
 		char.PetReactivated = false
 		_ = saveAdvCharacter(char)
+		_ = upsertPlayerMetaPetState(char.UserID, petStateFromAdvChar(char))
 		return p.SendDM(ctx.Sender, "You chased it away. It disappeared around the corner and didn't come back.\n\nThe house is quiet again.")
 	}
 
@@ -255,7 +277,7 @@ func (p *AdventurePlugin) resolvePetArrival(ctx MessageContext) error {
 		p.pending.Store(string(ctx.Sender), &advPendingInteraction{
 			Type:      "pet_type",
 			Data:      &advPendingPetType{},
-			ExpiresAt: time.Now().Add(advDMResponseWindow),
+			ExpiresAt: time.Now().Add(advDMResponseWindowLow),
 		})
 		return p.SendDM(ctx.Sender, text)
 	}
@@ -264,7 +286,7 @@ func (p *AdventurePlugin) resolvePetArrival(ctx MessageContext) error {
 	p.pending.Store(string(ctx.Sender), &advPendingInteraction{
 		Type:      "pet_arrival",
 		Data:      &advPendingPetArrival{},
-		ExpiresAt: time.Now().Add(advDMResponseWindow),
+		ExpiresAt: time.Now().Add(advDMResponseWindowLow),
 	})
 	return p.SendDM(ctx.Sender, "Reply with `chase` or `feed`.")
 }
@@ -288,7 +310,7 @@ func (p *AdventurePlugin) resolvePetType(ctx MessageContext) error {
 		p.pending.Store(string(ctx.Sender), &advPendingInteraction{
 			Type:      "pet_type",
 			Data:      &advPendingPetType{},
-			ExpiresAt: time.Now().Add(advDMResponseWindow),
+			ExpiresAt: time.Now().Add(advDMResponseWindowLow),
 		})
 		return p.SendDM(ctx.Sender, "Reply with `dog` or `cat`.")
 	}
@@ -296,7 +318,7 @@ func (p *AdventurePlugin) resolvePetType(ctx MessageContext) error {
 	p.pending.Store(string(ctx.Sender), &advPendingInteraction{
 		Type:      "pet_name",
 		Data:      &advPendingPetName{PetType: petType},
-		ExpiresAt: time.Now().Add(advDMResponseWindow),
+		ExpiresAt: time.Now().Add(advDMResponseWindowLow),
 	})
 
 	article := "a"
@@ -307,8 +329,11 @@ func (p *AdventurePlugin) resolvePetType(ctx MessageContext) error {
 		article, titleCase(petType)))
 }
 
-// resolvePetName handles naming the pet.
-func (p *AdventurePlugin) resolvePetName(ctx MessageContext) error {
+// resolvePetName handles naming the pet. The dispatcher (handlePendingReply)
+// has already deleted the pending interaction and passes it in, so this must
+// NOT re-load from p.pending — doing so previously made every adoption fail
+// silently (the carried PetType was lost and the save never ran).
+func (p *AdventurePlugin) resolvePetName(ctx MessageContext, interaction *advPendingInteraction) error {
 	userMu := p.advUserLock(ctx.Sender)
 	userMu.Lock()
 	defer userMu.Unlock()
@@ -318,20 +343,15 @@ func (p *AdventurePlugin) resolvePetName(ctx MessageContext) error {
 		return p.SendDM(ctx.Sender, "Failed to load your character.")
 	}
 
-	val, ok := p.pending.LoadAndDelete(string(ctx.Sender))
-	if !ok {
-		return nil
-	}
-	pi := val.(*advPendingInteraction)
-	data := pi.Data.(*advPendingPetName)
+	data := interaction.Data.(*advPendingPetName)
 
 	name := strings.TrimSpace(ctx.Body)
 	if len(name) == 0 || len(name) > 30 {
-		p.pending.Store(string(ctx.Sender), pi)
+		p.pending.Store(string(ctx.Sender), interaction)
 		return p.SendDM(ctx.Sender, "Name must be 1-30 characters. Try again.")
 	}
 	if !petNameValid.MatchString(name) {
-		p.pending.Store(string(ctx.Sender), pi)
+		p.pending.Store(string(ctx.Sender), interaction)
 		return p.SendDM(ctx.Sender, "Name can only contain letters, numbers, spaces, hyphens, and apostrophes. Try again.")
 	}
 
@@ -345,6 +365,7 @@ func (p *AdventurePlugin) resolvePetName(ctx MessageContext) error {
 	if err := saveAdvCharacter(char); err != nil {
 		return p.SendDM(ctx.Sender, "Failed to save.")
 	}
+	_ = upsertPlayerMetaPetState(char.UserID, petStateFromAdvChar(char))
 
 	emoji := "🐶"
 	if data.PetType == "cat" {
@@ -358,8 +379,8 @@ func (p *AdventurePlugin) resolvePetName(ctx MessageContext) error {
 
 // petMorningEvent rolls for a morning pet event and returns flavor text.
 // Returns empty string if no event fires.
-func petMorningEvent(char *AdventureCharacter) string {
-	if !char.HasPet() {
+func petMorningEvent(pet PetState) string {
+	if !pet.HasPet() {
 		return ""
 	}
 
@@ -368,23 +389,23 @@ func petMorningEvent(char *AdventureCharacter) string {
 		return ""
 	}
 
-	if char.PetType == "cat" {
+	if pet.Type == "cat" {
 		line := PetCatOffering[rand.IntN(len(PetCatOffering))]
-		return strings.ReplaceAll(line, "{pet_name}", char.PetName)
+		return strings.ReplaceAll(line, "{pet_name}", pet.Name)
 	}
 
 	line := PetDogSmothering[rand.IntN(len(PetDogSmothering))]
-	return strings.ReplaceAll(line, "{pet_name}", char.PetName)
+	return strings.ReplaceAll(line, "{pet_name}", pet.Name)
 }
 
 // ── Pet Supply Shop Unlock Check ───────────────────────────────────────────
 
 // petCheckSupplyShopUnlock checks if 1 week has passed since pet hit level 10.
-func petCheckSupplyShopUnlock(char *AdventureCharacter) bool {
-	if char.PetSupplyShopUnlocked || char.PetLevel10Date == "" {
+func petCheckSupplyShopUnlock(pet PetState) bool {
+	if pet.SupplyShopUnlocked || pet.Level10Date == "" {
 		return false
 	}
-	d, err := time.Parse("2006-01-02", char.PetLevel10Date)
+	d, err := time.Parse("2006-01-02", pet.Level10Date)
 	if err != nil {
 		return false
 	}
@@ -394,12 +415,15 @@ func petCheckSupplyShopUnlock(char *AdventureCharacter) bool {
 // ── Misty Housing Hint ─────────────────────────────────────────────────────
 
 // mistyHousingHint returns a hint about housing/pets if conditions are met.
-// Fires once, after 2+ Misty encounters, player has no house.
-func mistyHousingHint(char *AdventureCharacter) string {
-	if char.HasHouse() || char.MistyEncounterCount < 2 {
+// Fires once, after 2+ Misty encounters, player has no house. Housing
+// state comes from player_meta (L4e reader flip). Misty NPC counters still
+// live on AdvCharacter (NPC migration is a later phase) so the caller
+// passes them in directly.
+func mistyHousingHint(mistyEncounterCount, mistyDonatedCount int, house HouseState) string {
+	if house.HasHouse() || mistyEncounterCount < 2 {
 		return ""
 	}
-	if char.MistyDonatedCount > 0 {
+	if mistyDonatedCount > 0 {
 		return "You seem like a good person. I can imagine you sitting in a house caring for a pet someday."
 	}
 	return "Thank you for your time."
@@ -407,11 +431,11 @@ func mistyHousingHint(char *AdventureCharacter) string {
 
 // ── Misty Pet Reactivation ─────────────────────────────────────────────────
 
-// mistyReactivatePet marks the pet as reactivated if it was chased away.
-func mistyReactivatePet(char *AdventureCharacter) {
-	if char.PetChasedAway && !char.PetReactivated {
-		char.PetReactivated = true
-	}
+// mistyReactivatePet returns true when a chased-away pet should be marked
+// as reactivated. Caller is responsible for flipping the flag on both
+// AdvCharacter and player_meta.
+func mistyReactivatePet(pet PetState) bool {
+	return pet.ChasedAway && !pet.Reactivated
 }
 
 // ── Pet Level 10 Ticker (runs daily at midnight) ───────────────────────────
@@ -429,9 +453,11 @@ func (p *AdventurePlugin) petMidnightCheck() {
 		}
 
 		// Check supply shop unlock
-		if petCheckSupplyShopUnlock(&char) {
+		pet, _ := loadPetState(char.UserID)
+		if petCheckSupplyShopUnlock(pet) {
 			char.PetSupplyShopUnlocked = true
 			_ = saveAdvCharacter(&char)
+			_ = upsertPlayerMetaPetState(char.UserID, petStateFromAdvChar(&char))
 			slog.Info("pet: supply shop unlocked", "user", char.UserID, "pet", char.PetName)
 		}
 	}

internal/plugin/adventure_pets_dispatch_test.go

@@ -0,0 +1,51 @@
+package plugin
+
+import (
+	"testing"
+	"time"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// TestResolvePetName_ThroughDispatcher is a regression test for the bug where
+// resolvePendingInteraction deleted the pending entry before dispatch, while
+// resolvePetName then tried to LoadAndDelete it again — always missing, so the
+// adoption silently no-op'd and no pet was ever persisted. The fix passes the
+// already-loaded interaction into resolvePetName. This test drives the real
+// dispatcher path (resolvePendingInteraction) to lock that in.
+func TestResolvePetName_ThroughDispatcher(t *testing.T) {
+	setupAuditTestDB(t)
+	uid := id.UserID("@pet-name-dispatch:example")
+	if err := createAdvCharacter(uid, "petnamer"); err != nil {
+		t.Fatal(err)
+	}
+
+	p := &AdventurePlugin{}
+	interaction := &advPendingInteraction{
+		Type:      "pet_name",
+		Data:      &advPendingPetName{PetType: "dog"},
+		ExpiresAt: time.Now().Add(time.Hour),
+	}
+	p.pending.Store(string(uid), interaction)
+
+	if err := p.resolvePendingInteraction(MessageContext{Sender: uid, Body: "Pepper"}, interaction); err != nil {
+		t.Fatal(err)
+	}
+
+	pet, err := loadPetState(uid)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !pet.HasPet() {
+		t.Fatalf("expected pet to be adopted; got %+v", pet)
+	}
+	if pet.Name != "Pepper" {
+		t.Errorf("pet name = %q, want Pepper", pet.Name)
+	}
+	if pet.Type != "dog" {
+		t.Errorf("pet type = %q, want dog", pet.Type)
+	}
+	if !pet.Arrived || pet.Level != 1 {
+		t.Errorf("pet arrived=%v level=%d, want true/1", pet.Arrived, pet.Level)
+	}
+}

internal/plugin/adventure_pets_test.go

@@ -41,67 +41,67 @@ func TestPetXPToNextLevel_Increasing(t *testing.T) {
 }
 
 func TestPetGrantXP_LevelsUp(t *testing.T) {
-	char := &AdventureCharacter{
-		PetType:    "dog",
-		PetName:    "Rex",
-		PetArrived: true,
-		PetLevel:   1,
-		PetXP:      950, // close to needing 1000 (10 * 100 centixp)
+	pet := &PetState{
+		Type:    "dog",
+		Name:    "Rex",
+		Arrived: true,
+		Level:   1,
+		XP:      950, // close to needing 1000 (10 * 100 centixp)
 	}
-	leveled := petGrantXP(char)
+	leveled := petGrantXP(pet)
 	if !leveled {
 		t.Error("should have leveled up")
 	}
-	if char.PetLevel != 2 {
-		t.Errorf("pet level should be 2, got %d", char.PetLevel)
+	if pet.Level != 2 {
+		t.Errorf("pet level should be 2, got %d", pet.Level)
 	}
 }
 
 func TestPetGrantXP_NoPet(t *testing.T) {
-	char := &AdventureCharacter{}
-	if petGrantXP(char) {
+	pet := &PetState{}
+	if petGrantXP(pet) {
 		t.Error("should not grant XP without a pet")
 	}
 }
 
 func TestPetGrantXP_MaxLevel(t *testing.T) {
-	char := &AdventureCharacter{
-		PetType:    "cat",
-		PetName:    "Luna",
-		PetArrived: true,
-		PetLevel:   10,
-		PetXP:      9999,
+	pet := &PetState{
+		Type:    "cat",
+		Name:    "Luna",
+		Arrived: true,
+		Level:   10,
+		XP:      9999,
 	}
-	if petGrantXP(char) {
+	if petGrantXP(pet) {
 		t.Error("should not level up past max level 10")
 	}
 }
 
 func TestPetGrantXP_ChasedAway(t *testing.T) {
-	char := &AdventureCharacter{
-		PetType:      "dog",
-		PetName:      "Rex",
-		PetArrived:   true,
-		PetChasedAway: true,
-		PetLevel:     1,
-		PetXP:        0,
+	pet := &PetState{
+		Type:       "dog",
+		Name:       "Rex",
+		Arrived:    true,
+		ChasedAway: true,
+		Level:      1,
+		XP:         0,
 	}
-	if petGrantXP(char) {
+	if petGrantXP(pet) {
 		t.Error("should not grant XP to chased-away pet")
 	}
 }
 
 func TestPetGrantXP_SetsLevel10Date(t *testing.T) {
-	char := &AdventureCharacter{
-		PetType:    "dog",
-		PetName:    "Rex",
-		PetArrived: true,
-		PetLevel:   9,
-		PetXP:      4999, // needs 5000 (50 * 100) for level 9→10
+	pet := &PetState{
+		Type:    "dog",
+		Name:    "Rex",
+		Arrived: true,
+		Level:   9,
+		XP:      4999, // needs 5000 (50 * 100) for level 9→10
 	}
-	petGrantXP(char)
-	if char.PetLevel == 10 && char.PetLevel10Date == "" {
-		t.Error("reaching level 10 should set PetLevel10Date")
+	petGrantXP(pet)
+	if pet.Level == 10 && pet.Level10Date == "" {
+		t.Error("reaching level 10 should set Level10Date")
 	}
 }
 
@@ -167,46 +167,42 @@ func TestPetDitchRecoveryChance_Level10(t *testing.T) {
 // ── Pet Combat Results ─────────────────────────────────────────────────────
 
 func TestPetRollCombatActions_NoPet(t *testing.T) {
-	char := &AdventureCharacter{}
-	result := petRollCombatActions(char, "Goblin")
+	result := petRollCombatActions(PetState{}, "Goblin")
 	if result != nil {
 		t.Error("should return nil without a pet")
 	}
 }
 
 func TestPetRollDitchRecovery_NoPet(t *testing.T) {
-	char := &AdventureCharacter{}
-	if petRollDitchRecovery(char) {
+	if petRollDitchRecovery(PetState{}) {
 		t.Error("should return false without a pet")
 	}
 }
 
 func TestPetVictoryText_Dog(t *testing.T) {
-	char := &AdventureCharacter{PetType: "dog", PetName: "Rex", PetArrived: true}
-	text := petVictoryText(char)
+	pet := PetState{Type: "dog", Name: "Rex", Arrived: true}
+	text := petVictoryText(pet)
 	if text == "" {
 		t.Error("should return victory text for dog")
 	}
 }
 
 func TestPetVictoryText_Cat(t *testing.T) {
-	char := &AdventureCharacter{PetType: "cat", PetName: "Luna", PetArrived: true}
-	text := petVictoryText(char)
+	pet := PetState{Type: "cat", Name: "Luna", Arrived: true}
+	text := petVictoryText(pet)
 	if text == "" {
 		t.Error("should return victory text for cat")
 	}
 }
 
 func TestPetVictoryText_NoPet(t *testing.T) {
-	char := &AdventureCharacter{}
-	if petVictoryText(char) != "" {
+	if petVictoryText(PetState{}) != "" {
 		t.Error("should return empty string without pet")
 	}
 }
 
 func TestPetDeathText_NoPet(t *testing.T) {
-	char := &AdventureCharacter{}
-	if petDeathText(char) != "" {
+	if petDeathText(PetState{}) != "" {
 		t.Error("should return empty string without pet")
 	}
 }
@@ -214,37 +210,33 @@ func TestPetDeathText_NoPet(t *testing.T) {
 // ── Pet Arrival Logic ──────────────────────────────────────────────────────
 
 func TestPetShouldArrive_NoHouse(t *testing.T) {
-	char := &AdventureCharacter{HouseTier: 0}
-	if petShouldArrive(char) {
+	if petShouldArrive(PetState{}, HouseState{Tier: 0}) {
 		t.Error("should not arrive without house")
 	}
 }
 
 func TestPetShouldArrive_BaseHouseOnly(t *testing.T) {
-	char := &AdventureCharacter{HouseTier: 1} // Base house, not yet Livable
-	if petShouldArrive(char) {
+	if petShouldArrive(PetState{}, HouseState{Tier: 1}) { // Base house, not yet Livable
 		t.Error("should not arrive with only base house (need tier 2+)")
 	}
 }
 
 func TestPetShouldArrive_AlreadyArrived(t *testing.T) {
-	char := &AdventureCharacter{HouseTier: 2, PetArrived: true}
-	if petShouldArrive(char) {
+	if petShouldArrive(PetState{Arrived: true}, HouseState{Tier: 2}) {
 		t.Error("should not trigger if pet already arrived")
 	}
 }
 
 func TestPetShouldArrive_ChasedAway(t *testing.T) {
-	char := &AdventureCharacter{HouseTier: 2, PetChasedAway: true}
-	if petShouldArrive(char) {
+	if petShouldArrive(PetState{ChasedAway: true}, HouseState{Tier: 2}) {
 		t.Error("should not trigger if pet was chased away (and not reactivated)")
 	}
 }
 
 func TestPetShouldArrive_Reactivated(t *testing.T) {
-	char := &AdventureCharacter{HouseTier: 2, PetChasedAway: true, PetReactivated: true}
+	pet := PetState{ChasedAway: true, Reactivated: true}
 	// With reactivation, should always return true
-	if !petShouldArrive(char) {
+	if !petShouldArrive(pet, HouseState{Tier: 2}) {
 		t.Error("reactivated pet should always trigger arrival")
 	}
 }
@@ -274,8 +266,7 @@ func TestHasPet(t *testing.T) {
 // ── Morning Pet Events ─────────────────────────────────────────────────────
 
 func TestPetMorningEvent_NoPet(t *testing.T) {
-	char := &AdventureCharacter{}
-	if petMorningEvent(char) != "" {
+	if petMorningEvent(PetState{}) != "" {
 		t.Error("should return empty string without pet")
 	}
 }
@@ -283,30 +274,26 @@ func TestPetMorningEvent_NoPet(t *testing.T) {
 // ── Misty Housing Hint ─────────────────────────────────────────────────────
 
 func TestMistyHousingHint_NoEncounters(t *testing.T) {
-	char := &AdventureCharacter{MistyEncounterCount: 0}
-	if mistyHousingHint(char) != "" {
+	if mistyHousingHint(0, 0, HouseState{}) != "" {
 		t.Error("should not hint with 0 encounters")
 	}
 }
 
 func TestMistyHousingHint_HasHouse(t *testing.T) {
-	char := &AdventureCharacter{MistyEncounterCount: 3, HouseTier: 1}
-	if mistyHousingHint(char) != "" {
+	if mistyHousingHint(3, 0, HouseState{Tier: 1}) != "" {
 		t.Error("should not hint if player has house")
 	}
 }
 
 func TestMistyHousingHint_Donated(t *testing.T) {
-	char := &AdventureCharacter{MistyEncounterCount: 2, MistyDonatedCount: 1}
-	hint := mistyHousingHint(char)
+	hint := mistyHousingHint(2, 1, HouseState{})
 	if !strings.Contains(hint, "house") {
 		t.Errorf("donated player hint should mention house, got: %q", hint)
 	}
 }
 
 func TestMistyHousingHint_NotDonated(t *testing.T) {
-	char := &AdventureCharacter{MistyEncounterCount: 2, MistyDonatedCount: 0}
-	hint := mistyHousingHint(char)
+	hint := mistyHousingHint(2, 0, HouseState{})
 	if hint != "Thank you for your time." {
 		t.Errorf("non-donor hint should be dismissive, got: %q", hint)
 	}
@@ -315,56 +302,50 @@ func TestMistyHousingHint_NotDonated(t *testing.T) {
 // ── Misty Pet Reactivation ─────────────────────────────────────────────────
 
 func TestMistyReactivatePet_ChasedAway(t *testing.T) {
-	char := &AdventureCharacter{PetChasedAway: true, PetReactivated: false}
-	mistyReactivatePet(char)
-	if !char.PetReactivated {
-		t.Error("should set PetReactivated")
+	pet := PetState{ChasedAway: true, Reactivated: false}
+	if !mistyReactivatePet(pet) {
+		t.Error("should signal reactivation for chased-away pet")
 	}
 }
 
 func TestMistyReactivatePet_NotChasedAway(t *testing.T) {
-	char := &AdventureCharacter{PetChasedAway: false, PetReactivated: false}
-	mistyReactivatePet(char)
-	if char.PetReactivated {
-		t.Error("should not set PetReactivated if pet wasn't chased away")
+	pet := PetState{ChasedAway: false, Reactivated: false}
+	if mistyReactivatePet(pet) {
+		t.Error("should not reactivate if pet wasn't chased away")
 	}
 }
 
 func TestMistyReactivatePet_AlreadyReactivated(t *testing.T) {
-	char := &AdventureCharacter{PetChasedAway: true, PetReactivated: true}
-	mistyReactivatePet(char)
-	if !char.PetReactivated {
-		t.Error("should remain reactivated")
+	pet := PetState{ChasedAway: true, Reactivated: true}
+	if mistyReactivatePet(pet) {
+		t.Error("should not re-signal once already reactivated")
 	}
 }
 
 // ── Pet Supply Shop Unlock ─────────────────────────────────────────────────
 
 func TestPetCheckSupplyShopUnlock_NotLevel10(t *testing.T) {
-	char := &AdventureCharacter{PetLevel10Date: ""}
-	if petCheckSupplyShopUnlock(char) {
+	if petCheckSupplyShopUnlock(PetState{Level10Date: ""}) {
 		t.Error("should not unlock without level 10 date")
 	}
 }
 
 func TestPetCheckSupplyShopUnlock_AlreadyUnlocked(t *testing.T) {
-	char := &AdventureCharacter{PetSupplyShopUnlocked: true, PetLevel10Date: "2020-01-01"}
-	if petCheckSupplyShopUnlock(char) {
+	pet := PetState{SupplyShopUnlocked: true, Level10Date: "2020-01-01"}
+	if petCheckSupplyShopUnlock(pet) {
 		t.Error("should not re-trigger if already unlocked")
 	}
 }
 
 func TestPetCheckSupplyShopUnlock_TooSoon(t *testing.T) {
 	// Set date to today — not 7 days ago
-	char := &AdventureCharacter{PetLevel10Date: "2099-01-01"}
-	if petCheckSupplyShopUnlock(char) {
+	if petCheckSupplyShopUnlock(PetState{Level10Date: "2099-01-01"}) {
 		t.Error("should not unlock before 7 days have passed")
 	}
 }
 
 func TestPetCheckSupplyShopUnlock_Ready(t *testing.T) {
-	char := &AdventureCharacter{PetLevel10Date: "2020-01-01"}
-	if !petCheckSupplyShopUnlock(char) {
+	if !petCheckSupplyShopUnlock(PetState{Level10Date: "2020-01-01"}) {
 		t.Error("should unlock after 7+ days")
 	}
 }

internal/plugin/adventure_render.go

@@ -2,6 +2,7 @@ package plugin
 
 import (
 	"fmt"
+	"hash/fnv"
 	"math/rand/v2"
 	"strings"
 	"sync"
@@ -88,14 +89,21 @@ func advSubstituteFlavor(template string, vars map[string]string) string {
 
 // ── Character Sheet ──────────────────────────────────────────────────────────
 
-func renderAdvCharacterSheet(char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, items []AdvItem, treasures []AdvTreasureBonus, balance float64) string {
+func renderAdvCharacterSheet(userID id.UserID, equip map[EquipmentSlot]*AdvEquipment, items []AdvItem, treasures []AdvTreasureBonus, balance float64) string {
 	var sb strings.Builder
 
-	sb.WriteString(fmt.Sprintf("⚔️ **%s's Adventurer**\n\n", char.DisplayName))
+	char, err := loadAdvCharacter(userID)
+	if err != nil || char == nil {
+		return "No adventurer found. Type `!adventure` to begin."
+	}
 
-	// Stats
+	displayName, _ := loadDisplayName(userID)
+	sb.WriteString(fmt.Sprintf("⚔️ **%s's Adventurer**\n\n", displayName))
+
+	// Stats — Combat line shows D&D Level (CombatXP display retired in L4f).
+	dndLevel := dndLevelForUser(userID)
 	sb.WriteString("📊 Stats:\n")
-	sb.WriteString(fmt.Sprintf("  Combat:  Lv.%d  (%d/%d XP)\n", char.CombatLevel, char.CombatXP, xpToNextLevel(char.CombatLevel)))
+	sb.WriteString(fmt.Sprintf("  Combat:  Lv.%d\n", dndLevel))
 	sb.WriteString(fmt.Sprintf("  Mining:  Lv.%d  (%d/%d XP)\n", char.MiningSkill, char.MiningXP, xpToNextLevel(char.MiningSkill)))
 	sb.WriteString(fmt.Sprintf("  Forage:  Lv.%d  (%d/%d XP)\n", char.ForagingSkill, char.ForagingXP, xpToNextLevel(char.ForagingSkill)))
 	sb.WriteString(fmt.Sprintf("  Fishing: Lv.%d  (%d/%d XP)\n", char.FishingSkill, char.FishingXP, xpToNextLevel(char.FishingSkill)))
@@ -131,22 +139,29 @@ func renderAdvCharacterSheet(char *AdventureCharacter, equip map[EquipmentSlot]*
 	eqScore := advEquipmentScore(equip)
 	for _, slot := range allSlots {
 		eq := equip[slot]
+		if eq == nil {
+			continue
+		}
+		marker := ""
+		if eq.Masterwork {
+			marker = " ⭐"
+		} else if eq.ArenaTier > 0 {
+			marker = " ⚔️"
+		}
+		// Mastery segment is appended as a third inline field after
+		// condition only when there's progress — keeps rows tight for
+		// freshly-equipped gear and grows with use.
 		mastery := ""
-		if eq != nil && eq.ActionsUsed >= 20 {
-			mastery = " ✦"
-		}
-		if eq != nil {
-			marker := ""
-			if eq.Masterwork {
-				marker = " ⭐"
-			} else if eq.ArenaTier > 0 {
-				marker = " ⚔️"
-			}
-			sb.WriteString(fmt.Sprintf("  %s %s: %s%s (Tier %d | %d%% condition%s)\n",
-				slotEmoji(slot), slotTitle(slot), eq.Name, marker, eq.Tier, eq.Condition, mastery))
+		if seg := advMasteryRowSegment(eq.ActionsUsed); seg != "" {
+			mastery = " | " + seg
 		}
+		sb.WriteString(fmt.Sprintf("  %s %s: %s%s (Tier %d | %d%% cond%s)\n",
+			slotEmoji(slot), slotTitle(slot), eq.Name, marker, eq.Tier, eq.Condition, mastery))
 	}
 	sb.WriteString(fmt.Sprintf("  Equipment Score: %.1f\n", eqScore))
+	if line := renderAdvMasteryAggregate(equip); line != "" {
+		sb.WriteString("  " + line + "\n")
+	}
 
 	// Treasures
 	if len(treasures) > 0 {
@@ -157,15 +172,8 @@ func renderAdvCharacterSheet(char *AdventureCharacter, equip map[EquipmentSlot]*
 				continue
 			}
 			seen[t.TreasureKey] = true
-			// Find def for inventory desc
-			for tier, defs := range advAllTreasures {
-				_ = tier
-				for _, def := range defs {
-					if def.Key == t.TreasureKey {
-						sb.WriteString(fmt.Sprintf("  %s\n", def.InventoryDesc))
-						break
-					}
-				}
+			if def := lookupAdvTreasureDef(t.TreasureKey); def != nil {
+				sb.WriteString(fmt.Sprintf("  %s\n", def.InventoryDesc))
 			}
 		}
 	}
@@ -192,9 +200,10 @@ func renderAdvCharacterSheet(char *AdventureCharacter, equip map[EquipmentSlot]*
 		sb.WriteString(fmt.Sprintf("\n🍼 Babysitting: %s (focus: %s)\n", remaining, char.BabysitSkillFocus))
 	}
 
-	// Rival status
-	if char.RivalPool == 1 {
-		records, _ := loadAllRivalRecords(char.UserID)
+	// Rival status — read from player_meta (Adv 2.0 Phase L4b).
+	rivalPoolFlag, _, _ := loadRivalState(userID)
+	if rivalPoolFlag == 1 {
+		records, _ := loadAllRivalRecords(userID)
 		sb.WriteString("\n⚔️ Rivals: Unlocked")
 		if len(records) > 0 {
 			totalW, totalL := 0, 0
@@ -207,54 +216,117 @@ func renderAdvCharacterSheet(char *AdventureCharacter, equip map[EquipmentSlot]*
 		sb.WriteString(" — `!adventure rivals` for details\n")
 	}
 
-	// Today's actions
-	isHolSheet, _ := isHolidayToday()
-	combatMax := maxCombatActions
-	harvestMax := maxHarvestActions
-	if isHolSheet {
-		combatMax++
-		harvestMax++
-	}
-	combatRemaining := combatMax - char.CombatActionsUsed
-	if combatRemaining < 0 {
-		combatRemaining = 0
-	}
-	harvestRemaining := harvestMax - char.HarvestActionsUsed
-	if harvestRemaining < 0 {
-		harvestRemaining = 0
-	}
-	if char.HasActedToday() {
-		sb.WriteString(fmt.Sprintf("\n📅 Today: %d combat, %d harvest actions remaining", combatRemaining, harvestRemaining))
-	} else {
-		sb.WriteString(fmt.Sprintf("\n📅 Today: %d combat, %d harvest actions available", combatRemaining, harvestRemaining))
-	}
-
 	return sb.String()
 }
 
 // ── Morning DM ───────────────────────────────────────────────────────────────
 
-func renderAdvMorningDM(char *AdventureCharacter, equip map[EquipmentSlot]*AdvEquipment, balance float64, bonuses *AdvBonusSummary, holidayName string) string {
+// renderCraftingTeaser surfaces the crafting system before and just after
+// the Foraging-10 auto-unlock, so it doesn't stay invisible to players who
+// never type !adventure recipes. Returns "" when the teaser shouldn't fire
+// today (out of pre-unlock window, or already deep into post-unlock).
+func renderCraftingTeaser(userID id.UserID) string {
+	char, err := loadAdvCharacter(userID)
+	if err != nil || char == nil {
+		return ""
+	}
+	return craftingTeaserText(char.ForagingSkill, char.CraftsSucceeded, userID)
+}
+
+// craftingTeaserText is the pure-logic core of renderCraftingTeaser, split
+// out so unit tests can exercise the bracket boundaries without a DB.
+func craftingTeaserText(foragingSkill, craftsSucceeded int, userID id.UserID) string {
+	const unlock = 10
+	if foragingSkill < unlock {
+		// Pre-unlock teaser: only when within 3 levels.
+		if foragingSkill < unlock-3 {
+			return ""
+		}
+		levelsToGo := unlock - foragingSkill
+		return fmt.Sprintf("🧪 **Crafting unlocks in %d Foraging level%s** — auto-craft consumables from gathered ingredients (Berry Poultice, Herb Salve, etc.).",
+			levelsToGo, plural(levelsToGo))
+	}
+
+	// Post-unlock: nudge when no successful crafts yet (gentle), or once a
+	// week (loose periodicity via day-of-year %).
+	if craftsSucceeded == 0 {
+		return "🧪 **Crafting is unlocked.** Gather a couple of matching ingredients and I will auto-craft consumables — try `!adventure recipes` to see what your level supports."
+	}
+	if int(time.Now().UTC().Weekday()) == craftingReminderWeekday(userID, time.Now().UTC()) {
+		return "🧪 *Crafting reminder* — `!adventure recipes` shows what's available at Foraging Lv." + fmt.Sprintf("%d.", foragingSkill)
+	}
+	return ""
+}
+
+// craftingReminderWeekday picks the day-of-week (0=Sunday..6=Saturday) on
+// which a given player gets the weekly crafting nudge during the given
+// week. Stable within an ISO week (predictable, not annoying), rotates
+// across weeks (not always the same day long-term).
+func craftingReminderWeekday(userID id.UserID, now time.Time) int {
+	year, week := now.ISOWeek()
+	h := fnv.New32a()
+	fmt.Fprintf(h, "%s|%d|%d", string(userID), year, week)
+	return int(h.Sum32() % 7)
+}
+
+func plural(n int) string {
+	if n == 1 {
+		return ""
+	}
+	return "s"
+}
+
+// renderRivalNudge surfaces a pending rival challenge in the morning DM so
+// players who missed or ignored the dramatic challenge DM see a reminder
+// before it expires. Returns "" if there's no pending challenge against
+// this player.
+func renderRivalNudge(userID id.UserID) string {
+	c := pendingRivalChallengeForChallenged(userID)
+	if c == nil {
+		return ""
+	}
+	hours := int(time.Until(c.ExpiresAt).Hours())
+	if hours < 1 {
+		hours = 1 // floor — "<1h" feels worse than "1h"
+	}
+	rivalName := string(c.ChallengerID)
+	if name, err := loadDisplayName(c.ChallengerID); err == nil && name != "" {
+		rivalName = name
+	}
+	return fmt.Sprintf("⚔️ **Rival challenge open** — %s, round %d/3, €%d on the line · expires in %dh · reply **rock**, **paper**, or **scissors**",
+		rivalName, c.Round, c.Stake, hours)
+}
+
+func renderAdvMorningDM(userID id.UserID, equip map[EquipmentSlot]*AdvEquipment, balance float64, bonuses *AdvBonusSummary, holidayName string) string {
 	var sb strings.Builder
 
-	// Holiday notice (before greeting)
+	char, err := loadAdvCharacter(userID)
+	if err != nil || char == nil {
+		return ""
+	}
+
+	// Holiday notice (before greeting). Today's perks: TwinBee starts new
+	// runs in a slightly better mood (+5), expedition outfitting includes a
+	// complimentary standard pack, and every harvest yields one extra unit.
 	if holidayName != "" {
-		sb.WriteString(fmt.Sprintf("🎉 Happy %s! In recognition of %s, you get an extra combat and harvest action today.\n\n", holidayName, holidayName))
+		sb.WriteString(fmt.Sprintf("🎉 Happy %s! In recognition of %s, today's adventures come with TwinBee's blessing — new zone & expedition runs start at +5 mood, expedition outfitting includes a complimentary standard pack, and every harvest yields one extra unit.\n\n", holidayName, holidayName))
 	}
 
 	// Pick a morning greeting
-	greeting, _ := advPickFlavor(MorningDM, char.UserID, "morning_dm")
+	greeting, _ := advPickFlavor(MorningDM, userID, "morning_dm")
+	displayName, _ := loadDisplayName(userID)
+	dndLevel := dndLevelForUser(userID)
 	vars := map[string]string{
-		"{name}": char.DisplayName,
+		"{name}": displayName,
 		"{character_sheet}": fmt.Sprintf(
 			"  ⚔️ Combat Lv.%d  ⛏️ Mining Lv.%d  🌿 Foraging Lv.%d  🎣 Fishing Lv.%d\n  💰 €%.0f",
-			char.CombatLevel, char.MiningSkill, char.ForagingSkill, char.FishingSkill, balance),
+			dndLevel, char.MiningSkill, char.ForagingSkill, char.FishingSkill, balance),
 	}
 	sb.WriteString(advSubstituteFlavor(greeting, vars))
 	sb.WriteString("\n\n")
 
 	// Active buffs
-	buffs, _ := loadAdvActiveBuffs(char.UserID)
+	buffs, _ := loadAdvActiveBuffs(userID)
 	if len(buffs) > 0 {
 		sb.WriteString("✨ **Active buffs:**\n")
 		for _, b := range buffs {
@@ -280,94 +352,47 @@ func renderAdvMorningDM(char *AdventureCharacter, equip map[EquipmentSlot]*AdvEq
 		sb.WriteString("\n\n")
 	}
 
-	// Action budget
-	isHol := holidayName != ""
-	combatMax := maxCombatActions
-	harvestMax := maxHarvestActions
-	if isHol {
-		combatMax++
-		harvestMax++
-	}
-	combatLeft := combatMax - char.CombatActionsUsed
-	if combatLeft < 0 {
-		combatLeft = 0
-	}
-	harvestLeft := harvestMax - char.HarvestActionsUsed
+	// L3 closure announcement — surfaced for one-week post-deploy soak so
+	// active co-op participants see why the system is gone. Remove after
+	// 2026-05-16 (TODO: drop announcement block at that revisit).
+	sb.WriteString("📋 **Co-op dungeons closed for now** — `!expedition` is the way forward; a better co-op design is on the way.\n\n")
 
-	// Co-op participants have combat locked for the duration of the run.
-	coopRun, _ := loadCoopRunForUser(char.UserID)
-	inCoop := coopRun != nil && coopRun.Status == "active"
-
-	if inCoop {
-		sb.WriteString(fmt.Sprintf("📋 **Actions:** combat locked (in Co-op #%d, day %d/%d) · %d/%d harvest\n\n",
-			coopRun.ID, coopRun.CurrentDay, coopRun.TotalDays, harvestLeft, harvestMax))
-	} else {
-		sb.WriteString(fmt.Sprintf("📋 **Actions:** %d/%d combat · %d/%d harvest\n\n", combatLeft, combatMax, harvestLeft, harvestMax))
+	// Rival nudge — a pending challenge waits for action.
+	if line := renderRivalNudge(userID); line != "" {
+		sb.WriteString(line)
+		sb.WriteString("\n")
 	}
 
-	// Location choices
-	if inCoop {
-		sb.WriteString(fmt.Sprintf("**1️⃣ Dungeon:** _(off in the Co-op, no solo combat — `!coop status` for run state)_\n"))
-	} else if char.CanDoCombat(isHol) {
-		sb.WriteString("**1️⃣ Dungeon:**\n")
-		for _, el := range advEligibleLocations(char, equip, AdvActivityDungeon, bonuses) {
-			warn := ""
-			if el.InPenaltyZone {
-				warn = " ⚠️"
-			}
-			sb.WriteString(fmt.Sprintf("  • %s (Tier %d, ~%.0f%% death%s)\n", el.Location.Name, el.Location.Tier, el.DeathPct, warn))
-		}
-	} else {
-		sb.WriteString("**1️⃣ Dungeon:** _(no combat actions remaining)_\n")
+	// Crafting teaser — surface the system when it's near unlock or post-unlock.
+	if line := renderCraftingTeaser(userID); line != "" {
+		sb.WriteString(line)
+		sb.WriteString("\n")
 	}
 
-	if char.CanDoHarvest(isHol) {
-		sb.WriteString("**2️⃣ Mine:**\n")
-		for _, el := range advEligibleLocations(char, equip, AdvActivityMining, bonuses) {
-			warn := ""
-			if el.InPenaltyZone {
-				warn = " ⚠️"
-			}
-			sb.WriteString(fmt.Sprintf("  • %s (Tier %d, ~%.0f%% death%s)\n", el.Location.Name, el.Location.Tier, el.DeathPct, warn))
-		}
+	// Phase R1 — the daily activity loop (dungeon/mine/forage/fish) has been
+	// retired in favor of the expedition system. The menu now shows the new
+	// entry points for adventuring and keeps the still-active town services.
+	sb.WriteString("**🗺️ Adventure** — head into a zone:\n")
+	sb.WriteString("• `!expedition` — overview & open expeditions\n")
+	sb.WriteString("• `!expedition start <zone>` — begin a new run\n")
+	sb.WriteString("• Harvest is automatic — yields land as you walk through cleared rooms.\n")
+	sb.WriteString("\n")
 
-		sb.WriteString("**3️⃣ Forage:**\n")
-		for _, el := range advEligibleLocations(char, equip, AdvActivityForaging, bonuses) {
-			warn := ""
-			if el.InPenaltyZone {
-				warn = " ⚠️"
-			}
-			sb.WriteString(fmt.Sprintf("  • %s (Tier %d, ~%.0f%% death%s)\n", el.Location.Name, el.Location.Tier, el.DeathPct, warn))
-		}
+	sb.WriteString("**🏘️ In town:**\n")
+	sb.WriteString("• `5` / `shop` — buy/sell gear and loot\n")
+	sb.WriteString("• `6` / `blacksmith` — repair damaged equipment\n")
+	sb.WriteString("• `7` / `rest` — skip today, bank your luck\n")
+	sb.WriteString("• `!thom` — visit Krooke Realty 🏠\n\n")
 
-		sb.WriteString("**4️⃣ Fish:**\n")
-		for _, el := range advEligibleLocations(char, equip, AdvActivityFishing, bonuses) {
-			warn := ""
-			if el.InPenaltyZone {
-				warn = " ⚠️"
-			}
-			sb.WriteString(fmt.Sprintf("  • %s (Tier %d, ~%.0f%% death%s)\n", el.Location.Name, el.Location.Tier, el.DeathPct, warn))
-		}
-	} else {
-		sb.WriteString("**2️⃣ Mine:** _(no harvest actions remaining)_\n")
-		sb.WriteString("**3️⃣ Forage:** _(no harvest actions remaining)_\n")
-		sb.WriteString("**4️⃣ Fish:** _(no harvest actions remaining)_\n")
-	}
-
-	sb.WriteString("**5️⃣ Shop** — buy/sell gear and loot\n")
-	sb.WriteString("**6️⃣ Blacksmith** — repair damaged equipment\n")
-	sb.WriteString("**7️⃣ Rest** — skip today, bank your luck\n")
-	sb.WriteString("**8️⃣ Thom** — `!thom` visit Krooke Realty 🏠\n\n")
-
-	sb.WriteString("Reply with the number and location, e.g: `1 Soggy Cellar`\n")
-	sb.WriteString("You have until midnight UTC to choose.")
+	sb.WriteString("Reply with a number for in-town services, or run an expedition command directly.\n")
+	sb.WriteString("You have until midnight UTC to rest.")
 
 	return sb.String()
 }
 
 // ── Resolution DM ────────────────────────────────────────────────────────────
 
-func renderAdvResolutionDM(result *AdvActionResult, char *AdventureCharacter) string {
+func renderAdvResolutionDM(result *AdvActionResult, userID id.UserID) string {
 	var sb strings.Builder
 
 	sb.WriteString(result.FlavorText)
@@ -378,7 +403,7 @@ func renderAdvResolutionDM(result *AdvActionResult, char *AdventureCharacter) st
 
 	if result.Outcome == AdvOutcomeDeath {
 		sb.WriteString("💀 **You died.**\n")
-		if char.DeadUntil != nil {
+		if char, err := loadAdvCharacter(userID); err == nil && char != nil && char.DeadUntil != nil {
 			sb.WriteString(fmt.Sprintf("Expected return: %s UTC\n", char.DeadUntil.Format("2006-01-02 15:04")))
 		}
 	}
@@ -484,8 +509,13 @@ func advClosingBlock(outcome AdvOutcomeType, userID id.UserID, location string,
 
 // ── Death Status DM ──────────────────────────────────────────────────────────
 
-func renderAdvDeathStatusDM(char *AdventureCharacter) string {
-	cost := int64(char.CombatLevel) * 25_000
+func renderAdvDeathStatusDM(userID id.UserID) string {
+	char, err := loadAdvCharacter(userID)
+	if err != nil || char == nil {
+		return "💀 You're still dead."
+	}
+	// Cost mirrors hospitalCostsForUser (post-L4a): D&D Level × 50k after insurance.
+	_, cost := hospitalCostsForUser(char)
 	remaining := "unknown"
 	if char.DeadUntil != nil {
 		remaining = char.DeadUntil.Format("15:04")
@@ -498,48 +528,257 @@ func renderAdvDeathStatusDM(char *AdventureCharacter) string {
 
 // ── Respawn DM ───────────────────────────────────────────────────────────────
 
-func renderAdvRespawnDM(char *AdventureCharacter) string {
-	text, _ := advPickFlavor(RespawnDM, char.UserID, "respawn_dm")
+func renderAdvRespawnDM(userID id.UserID) string {
+	text, _ := advPickFlavor(RespawnDM, userID, "respawn_dm")
+	displayName, _ := loadDisplayName(userID)
 	return advSubstituteFlavor(text, map[string]string{
-		"{name}": char.DisplayName,
+		"{name}": displayName,
 	})
 }
 
+// ── Treasure List ───────────────────────────────────────────────────────────
+
+// lookupAdvTreasureDef returns the canonical definition for a treasure key,
+// or nil if unknown. Walks the tiered table; cheap because the total count
+// is small.
+func lookupAdvTreasureDef(key string) *AdvTreasureDef {
+	for _, defs := range advAllTreasures {
+		for i := range defs {
+			if defs[i].Key == key {
+				d := defs[i]
+				return &d
+			}
+		}
+	}
+	return nil
+}
+
+// renderAdvTreasureList renders the standalone treasure listing for
+// `!adventure treasures`. Shows each treasure, marks irreplaceable ones,
+// and surfaces the lock state so players know whether new drops will
+// auto-swap or be refused.
+func renderAdvTreasureList(treasures []AdvTreasureDef, locked bool) string {
+	var sb strings.Builder
+	sb.WriteString("💎 **Your Treasures**")
+	if locked {
+		sb.WriteString(" 🔒 _(locked — drops at cap refused)_")
+	}
+	sb.WriteString("\n\n")
+
+	if len(treasures) == 0 {
+		sb.WriteString("_No treasures yet. Higher-tier locations have higher drop rates._")
+		return sb.String()
+	}
+
+	for _, t := range treasures {
+		t := t
+		marker := ""
+		if advTreasureIrreplaceable(&t) {
+			marker = " 🛡️"
+		}
+		sb.WriteString(fmt.Sprintf("  • Tier %d · %s%s\n    _%s_\n", t.Tier, t.Name, marker, t.InventoryDesc))
+	}
+
+	if locked {
+		sb.WriteString("\n_Unlock with `!adventure treasures unlock` to allow higher-tier auto-swaps._")
+	} else {
+		sb.WriteString("\n_Higher-tier drops auto-swap your lowest replaceable treasure (10-min undo). 🛡️ = irreplaceable, never auto-discarded._\n_Lock with `!adventure treasures lock` to refuse drops at cap._")
+	}
+	return sb.String()
+}
+
+// renderAdvMasteryAggregate produces the one-line summary shown under the
+// equipment block on the character sheet. Three states:
+//   - Bonus active: shows percent, threshold count, cap-reached when at +10%.
+//   - No bonus but some progress: hints that a threshold is approaching.
+//   - No progress: empty (don't bloat sheets for new players).
+func renderAdvMasteryAggregate(equip map[EquipmentSlot]*AdvEquipment) string {
+	r := advMasteryRollup(equip)
+	if !r.AnyProgress {
+		return ""
+	}
+	if r.Bonus > 0 {
+		base := fmt.Sprintf("🎯 Mastery: +%.0f%% loot quality · %d threshold%s crossed",
+			r.Bonus, r.ThresholdsCrossed, plural(r.ThresholdsCrossed))
+		if r.MaxedSlots > 0 {
+			base += fmt.Sprintf(" · %d slot%s maxed", r.MaxedSlots, plural(r.MaxedSlots))
+		}
+		// Cap is +10%; the raw count keeps rising past it. Flag when the
+		// player is paying threshold tax for nothing.
+		if r.Bonus >= 10 {
+			base += " (cap reached)"
+		}
+		base += " · `!adventure mastery`"
+		return base
+	}
+	// Some progress, no thresholds crossed yet — surface the next gate.
+	return "🎯 Mastery: building up — first threshold at 50 actions/slot · `!adventure mastery`"
+}
+
+// ── Equipment Mastery View ──────────────────────────────────────────────────
+
+// renderAdvMasteryView renders a per-slot mastery readout: progress bar,
+// tier marker, and next threshold so players can see "where am I" between
+// the discrete celebration DMs that fire at threshold crossings.
+func renderAdvMasteryView(equip map[EquipmentSlot]*AdvEquipment) string {
+	var sb strings.Builder
+	sb.WriteString("🎯 **Equipment Mastery**\n\n")
+
+	any := false
+	for _, slot := range allSlots {
+		eq := equip[slot]
+		if eq == nil {
+			sb.WriteString(fmt.Sprintf("  %s %s — _empty_\n", slotEmoji(slot), slotTitle(slot)))
+			continue
+		}
+		any = true
+		tier, next := advMasteryTier(eq.ActionsUsed)
+		marker := advMasteryMarker(eq.ActionsUsed)
+		if marker == "" {
+			marker = "·"
+		}
+
+		// Bar against the next threshold (or against 250 when at max so the
+		// bar visually maxes out rather than disappearing).
+		var barTotal int
+		if next > 0 {
+			barTotal = next
+		} else {
+			barTotal = advMasteryThresholds[len(advMasteryThresholds)-1]
+		}
+		bar := masteryBar(eq.ActionsUsed, barTotal)
+		_ = tier
+
+		if next > 0 {
+			sb.WriteString(fmt.Sprintf("  %s %s · %s · %d/%d %s %s\n",
+				slotEmoji(slot), slotTitle(slot), eq.Name, eq.ActionsUsed, next, bar, marker))
+		} else {
+			sb.WriteString(fmt.Sprintf("  %s %s · %s · %d (max) %s %s\n",
+				slotEmoji(slot), slotTitle(slot), eq.Name, eq.ActionsUsed, bar, marker))
+		}
+	}
+
+	bonus := advEquipmentMasteryBonus(equip)
+	sb.WriteString("\n")
+	if !any {
+		sb.WriteString("_No equipment yet — gear up first._")
+		return sb.String()
+	}
+	if bonus > 0 {
+		sb.WriteString(fmt.Sprintf("**Active mastery bonus: +%.0f%% loot quality** (cap +10%%)\n", bonus))
+	} else {
+		sb.WriteString("_No mastery bonus yet — first threshold at 50 actions per slot._\n")
+	}
+	sb.WriteString("Thresholds: 50 ✦ · 100 ✦✦ · 250 ✦✦✦. Each crossed threshold per slot adds +1% loot quality.")
+	return sb.String()
+}
+
+// masteryBar builds a 10-cell progress bar for the mastery view.
+func masteryBar(value, total int) string {
+	if total <= 0 {
+		return "▱▱▱▱▱▱▱▱▱▱"
+	}
+	filled := value * 10 / total
+	if filled > 10 {
+		filled = 10
+	}
+	if filled < 0 {
+		filled = 0
+	}
+	return strings.Repeat("▰", filled) + strings.Repeat("▱", 10-filled)
+}
+
 // ── Idle Shame DM ────────────────────────────────────────────────────────────
 
-func renderAdvIdleShameDM(char *AdventureCharacter) string {
-	text, _ := advPickFlavor(IdleShameDM, char.UserID, "idle_shame")
+func renderAdvIdleShameDM(userID id.UserID) string {
+	text, _ := advPickFlavor(IdleShameDM, userID, "idle_shame")
+	displayName, _ := loadDisplayName(userID)
 	return advSubstituteFlavor(text, map[string]string{
-		"{name}": char.DisplayName,
+		"{name}": displayName,
 	})
 }
 
 // ── Onboarding DM ────────────────────────────────────────────────────────────
 
-func renderAdvOnboardingDM(char *AdventureCharacter) string {
-	text, _ := advPickFlavor(OnboardingDM, char.UserID, "onboarding")
+func renderAdvOnboardingDM(userID id.UserID) string {
+	text, _ := advPickFlavor(OnboardingDM, userID, "onboarding")
+	displayName, _ := loadDisplayName(userID)
 	return advSubstituteFlavor(text, map[string]string{
-		"{name}": char.DisplayName,
+		"{name}": displayName,
 	})
 }
 
 // ── Daily Summary ────────────────────────────────────────────────────────────
 
 type AdvPlayerDaySummary struct {
-	DisplayName    string
-	CombatLevel    int
-	MiningSkill    int
-	ForagingSkill  int
-	FishingSkill   int
+	DisplayName string
+
+	// D&D layer (preferred render). HasDnDChar=false → fall back to legacy
+	// skill-line render and "needs !setup" hint.
+	HasDnDChar bool
+	DnDLevel   int
+	DnDRace    string
+	DnDClass   string
+	HPCurrent  int
+	HPMax      int
+
+	// Legacy AdventureCharacter skill levels (rendered as fallback when
+	// HasDnDChar is false).
+	Level         int // legacy combat level
+	MiningSkill   int
+	ForagingSkill int
+	FishingSkill  int
+
 	Activity       string
 	Location       string
 	Outcome        string
 	LootValue      int64
 	IsDead         bool
 	DeadUntil      string
+	// DeadUntilHours is the integer hours-from-now until revival, used by
+	// the standout-death template's {hours} placeholder. Computed when
+	// the summary row is built; 0 if not dead or already past revival.
+	DeadUntilHours int
+	// DeadUntilDuration is the human-readable hours+minutes form of the
+	// remaining respawn time ("5h 27m", "47m", "2h"). Used by the
+	// {duration} placeholder for templates that want precision over the
+	// rounded {hours} count.
+	DeadUntilDuration string
 	IsResting      bool
 	SummaryLine    string
 	HolidayActions int // 0 = not holiday or no action; 1 = took one; 2 = took both
+	DeathSource    string
+	DeathLocation  string
+}
+
+// advPlayerHeadline renders the per-player headline for the daily report.
+// D&D shape ("Lv.4 Half-Elf Cleric — HP 27/27") is preferred; falls back to
+// the legacy four-skill line for accounts that haven't run !setup yet.
+func advPlayerHeadline(p *AdvPlayerDaySummary) string {
+	if p.HasDnDChar {
+		race := titleizeDnDToken(p.DnDRace)
+		class := titleizeDnDToken(p.DnDClass)
+		return fmt.Sprintf("Lv.%d %s %s — HP %d/%d",
+			p.DnDLevel, race, class, p.HPCurrent, p.HPMax)
+	}
+	return fmt.Sprintf("Combat Lv.%d | Mining Lv.%d | Forage Lv.%d | Fishing Lv.%d _(no D&D sheet — run `!setup`)_",
+		p.Level, p.MiningSkill, p.ForagingSkill, p.FishingSkill)
+}
+
+// titleizeDnDToken converts a snake_case D&D enum token like "half_elf" into
+// a human-readable label like "Half-Elf". Single-word tokens just title-case.
+func titleizeDnDToken(s string) string {
+	if s == "" {
+		return ""
+	}
+	parts := strings.Split(s, "_")
+	for i, p := range parts {
+		if p == "" {
+			continue
+		}
+		parts[i] = strings.ToUpper(p[:1]) + p[1:]
+	}
+	return strings.Join(parts, "-")
 }
 
 func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewardSummary, players []AdvPlayerDaySummary, holidayName string) string {
@@ -548,7 +787,7 @@ func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewa
 	sb.WriteString(fmt.Sprintf("📜 **ADVENTURER DAILY REPORT**\n%s\n\n", date))
 
 	if holidayName != "" {
-		sb.WriteString(fmt.Sprintf("🎉 In recognition of **%s**, adventurers had two actions today.\n\n", holidayName))
+		sb.WriteString(fmt.Sprintf("🎉 In recognition of **%s**, adventurers ran with TwinBee's blessing today: +5 starting mood, a free standard pack at outfitting, and +1 to every harvest yield.\n\n", holidayName))
 	}
 
 	// TwinBee section
@@ -597,7 +836,7 @@ func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewa
 				sb.WriteString(fmt.Sprintf("Rewards distributed to %d participating adventurers: jackshit.\n", tbRewards.Eligible))
 			}
 		}
-		sb.WriteString("\n(Players who rested today received nothing. Fallen adventurers still earn their share. TwinBee noticed.)\n\n")
+		sb.WriteString("\n(Players who rested today received nothing. Fallen adventurers still earn their share. I noticed.)\n\n")
 		sb.WriteString("───────────────────\n\n")
 	}
 
@@ -611,12 +850,28 @@ func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewa
 		p := &players[i]
 		if p.IsDead {
 			dead = append(dead, *p)
-			// Dead players who acted today still show in the main section
+			// Dead players who acted today still show in the main section.
+			// If they died OUTSIDE the adventure (e.g. Arena), the adventure
+			// itself was successful — show the alive icon for that block and
+			// append a "later fell" note. Empty DeathSource is legacy and
+			// treated as adventure-death (current behavior).
 			if p.Location != "" {
-				sb.WriteString(fmt.Sprintf("💀 **%s** — Combat Lv.%d | Mining Lv.%d | Forage Lv.%d | Fishing Lv.%d\n",
-					p.DisplayName, p.CombatLevel, p.MiningSkill, p.ForagingSkill, p.FishingSkill))
+				diedOnAdventure := p.DeathSource == "" || p.DeathSource == "adventure"
+				icon := "💀"
+				if !diedOnAdventure {
+					icon = "⚔️"
+				}
+				sb.WriteString(fmt.Sprintf("%s **%s** — %s\n", icon, p.DisplayName, advPlayerHeadline(p)))
 				sb.WriteString(fmt.Sprintf("   Went to: %s\n", p.Location))
-				sb.WriteString(fmt.Sprintf("   Outcome: %s\n\n", p.SummaryLine))
+				sb.WriteString(fmt.Sprintf("   Outcome: %s\n", p.SummaryLine))
+				if !diedOnAdventure {
+					where := p.DeathLocation
+					if where == "" {
+						where = "elsewhere"
+					}
+					sb.WriteString(fmt.Sprintf("   💀 Later fell in %s.\n", where))
+				}
+				sb.WriteString("\n")
 				if worstPlayer == nil {
 					worstPlayer = p
 				}
@@ -628,8 +883,7 @@ func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewa
 			continue
 		}
 
-		sb.WriteString(fmt.Sprintf("⚔️ **%s** — Combat Lv.%d | Mining Lv.%d | Forage Lv.%d | Fishing Lv.%d\n",
-			p.DisplayName, p.CombatLevel, p.MiningSkill, p.ForagingSkill, p.FishingSkill))
+		sb.WriteString(fmt.Sprintf("⚔️ **%s** — %s\n", p.DisplayName, advPlayerHeadline(p)))
 		if p.Location != "" {
 			sb.WriteString(fmt.Sprintf("   Went to: %s\n", p.Location))
 			sb.WriteString(fmt.Sprintf("   Outcome: %s\n\n", p.SummaryLine))
@@ -666,47 +920,6 @@ func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewa
 		sb.WriteString("\n")
 	}
 
-	// Holiday stats
-	if holidayName != "" {
-		tookBoth := 0
-		totalActive := 0
-		for _, p := range players {
-			if p.IsDead || p.IsResting {
-				if p.HolidayActions > 0 {
-					totalActive++
-				}
-				if p.HolidayActions >= 2 {
-					tookBoth++
-				}
-				continue
-			}
-			if p.Activity != "" {
-				totalActive++
-			}
-			if p.HolidayActions >= 2 {
-				tookBoth++
-			}
-		}
-		if totalActive > 0 {
-			sb.WriteString(fmt.Sprintf("🎉 %s double-action day — %d of %d adventurers took both actions.\n\n", holidayName, tookBoth, totalActive))
-		}
-
-		// Note players who died before their second action
-		for _, d := range dead {
-			if d.HolidayActions == 1 {
-				sb.WriteString(fmt.Sprintf("• %s — died in %s before their second action. Rough holiday.\n", d.DisplayName, d.Location))
-			}
-		}
-		if len(dead) > 0 {
-			// Check if any had HolidayActions == 1
-			for _, d := range dead {
-				if d.HolidayActions == 1 {
-					sb.WriteString("\n")
-					break
-				}
-			}
-		}
-	}
 
 	// Standout
 	if bestPlayer != nil && bestPlayer.LootValue > 0 {
@@ -725,9 +938,23 @@ func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewa
 		pool := SummaryStandoutDeath
 		if len(pool) > 0 {
 			line := pool[rand.IntN(len(pool))]
+			lossLoc := worstPlayer.DeathLocation
+			if lossLoc == "" {
+				lossLoc = worstPlayer.Location
+			}
+			hours := worstPlayer.DeadUntilHours
+			if hours <= 0 {
+				hours = 6 // canonical respawn duration when revival time isn't computable
+			}
+			duration := worstPlayer.DeadUntilDuration
+			if duration == "" {
+				duration = fmt.Sprintf("%dh", hours)
+			}
 			line = advSubstituteFlavor(line, map[string]string{
 				"{name}":     worstPlayer.DisplayName,
-				"{location}": worstPlayer.Location,
+				"{location}": lossLoc,
+				"{hours}":    fmt.Sprintf("%d", hours),
+				"{duration}": duration,
 			})
 			sb.WriteString(fmt.Sprintf("🏆 **Today's standout:** %s\n", line))
 		}
@@ -738,7 +965,19 @@ func renderAdvDailySummary(date string, tb *TwinBeeResult, tbRewards TwinBeeRewa
 
 // ── Leaderboard ──────────────────────────────────────────────────────────────
 
-func renderAdvLeaderboard(chars []AdventureCharacter) string {
+// AdvLeaderboardEntry is the view-model the leaderboard renderer consumes.
+// Callers populate it from AdvCharacter rows + a D&D level lookup so the
+// renderer doesn't depend on the legacy character type.
+type AdvLeaderboardEntry struct {
+	UserID        id.UserID
+	Level         int
+	MiningSkill   int
+	ForagingSkill int
+	FishingSkill  int
+	CurrentStreak int
+}
+
+func renderAdvLeaderboard(chars []AdvLeaderboardEntry) string {
 	if len(chars) == 0 {
 		return "No adventurers registered yet. Type `!adventure` to begin."
 	}
@@ -752,11 +991,12 @@ func renderAdvLeaderboard(chars []AdventureCharacter) string {
 	}
 	var entries []entry
 	for _, c := range chars {
-		score := (c.CombatLevel + c.MiningSkill + c.ForagingSkill + c.FishingSkill) * 10
+		score := (c.Level + c.MiningSkill + c.ForagingSkill + c.FishingSkill) * 10
+		name, _ := loadDisplayName(c.UserID)
 		entries = append(entries, entry{
-			Name:   c.DisplayName,
+			Name:   name,
 			Score:  score,
-			Levels: fmt.Sprintf("⚔️%d ⛏️%d 🌿%d 🎣%d", c.CombatLevel, c.MiningSkill, c.ForagingSkill, c.FishingSkill),
+			Levels: fmt.Sprintf("⚔️%d ⛏️%d 🌿%d 🎣%d", c.Level, c.MiningSkill, c.ForagingSkill, c.FishingSkill),
 			Streak: c.CurrentStreak,
 		})
 	}

internal/plugin/adventure_rival.go

@@ -18,13 +18,27 @@ import (
 // ── Constants ────────────────────────────────────────────────────────────────
 
 const (
-	rivalMinCombatLevel   = 5
+	// Adv 2.0 Phase L4b — gate switched off CombatLevel onto DnDCharacter.Level.
+	// Legacy gate was CombatLevel >= 5; new gate is Level >= 3
+	// (gogobee_legacy_migration.md §2.3).
+	rivalMinLevel         = 3
 	rivalChallengeWindow  = 24 * time.Hour
 	rivalSamePairCooldown = 7 * 24 * time.Hour
 	rivalMinIntervalHours = 3 * 24 // 3 days in hours
 	rivalMaxIntervalHours = 4 * 24 // 4 days in hours
 )
 
+// rivalLevelForUser returns the player's D&D level for rival gating + stake
+// math. Post-L5g every legacy player has a DnDCharacter row, so the
+// CombatLevel-derived fallback has been retired. Returns 1 as a safe floor
+// (filtered out by rivalMinLevel anyway).
+func rivalLevelForUser(char *AdventureCharacter) int {
+	if dnd, err := LoadDnDCharacter(char.UserID); err == nil && dnd != nil && dnd.Level > 0 {
+		return dnd.Level
+	}
+	return 1
+}
+
 // ── Types ────────────────────────────────────────────────────────────────────
 
 type advRivalChallenge struct {
@@ -52,19 +66,34 @@ type advPendingRivalRPS struct {
 
 // ── Stake Calculation ────────────────────────────────────────────────────────
 
-func rivalStake(combatLevel int) int {
-	return (combatLevel / 5) * 1000
+// rivalStake returns the duel stake in € for a given D&D Level.
+// Adv 2.0 Phase L4b — previously `(combatLevel / 5) * 1000`. New formula
+// `(level / 3) * 1000` keeps the same magnitude at the unlock threshold
+// (Level 3 = €1000, matching legacy CombatLevel 5 = €1000) and tops out
+// around €6000 at Level 20. Players below `rivalMinLevel` produce stake 0,
+// which selectRivalPair already filters out.
+func rivalStake(level int) int {
+	return (level / 3) * 1000
 }
 
 // ── Rival Pool Unlock ────────────────────────────────────────────────────────
 
 func (p *AdventurePlugin) checkRivalPoolUnlock(char *AdventureCharacter) {
-	if char.CombatLevel >= rivalMinCombatLevel && char.RivalPool == 0 {
-		char.RivalPool = 1
-		if !char.RivalUnlockedNotified {
-			char.RivalUnlockedNotified = true
-			p.SendDM(char.UserID, rivalUnlockDM)
-		}
+	level := rivalLevelForUser(char)
+	if level < rivalMinLevel {
+		return
+	}
+	pool, notified, _ := loadRivalState(char.UserID)
+	if pool > 0 && notified {
+		// Already unlocked + notified; nothing to do.
+		return
+	}
+	// Promote to pool + send unlock DM if not yet announced.
+	// Persistence rides the caller's saveAdvCharacter → fan-out.
+	char.RivalPool = 1
+	if !notified {
+		char.RivalUnlockedNotified = true
+		p.SendDM(char.UserID, rivalUnlockDM)
 	}
 }
 
@@ -247,6 +276,28 @@ func lastRivalChallengeTime() time.Time {
 	return time.Time{}
 }
 
+// pendingRivalChallengeForChallenged returns the active challenge where the
+// given user is the challenged party (i.e. the side that needs to act).
+// Returns nil if no challenge is pending or the user is only on the
+// auto-resolved challenger side.
+func pendingRivalChallengeForChallenged(userID id.UserID) *advRivalChallenge {
+	d := db.Get()
+	c := &advRivalChallenge{}
+	err := d.QueryRow(`
+		SELECT challenge_id, challenger_id, challenged_id, stake,
+		       round, player_score, rival_score, expires_at, created_at
+		FROM adventure_rival_challenges
+		WHERE challenged_id = ? AND expires_at > CURRENT_TIMESTAMP
+		ORDER BY created_at DESC LIMIT 1`, string(userID)).Scan(
+		&c.ChallengeID, &c.ChallengerID, &c.ChallengedID, &c.Stake,
+		&c.Round, &c.PlayerScore, &c.RivalScore, &c.ExpiresAt, &c.CreatedAt,
+	)
+	if err != nil {
+		return nil
+	}
+	return c
+}
+
 func hasActiveChallenge(userID id.UserID) bool {
 	d := db.Get()
 	var count int
@@ -281,13 +332,17 @@ func (p *AdventurePlugin) selectRivalPair() (*AdventureCharacter, *AdventureChar
 	// Filter to eligible pool members.
 	var pool []AdventureCharacter
 	for _, c := range chars {
-		if c.RivalPool == 0 || !c.Alive || c.BabysitActive {
+		if !c.Alive || c.BabysitActive {
+			continue
+		}
+		poolFlag, _, _ := loadRivalState(c.UserID)
+		if poolFlag == 0 {
 			continue
 		}
 		if hasActiveChallenge(c.UserID) {
 			continue
 		}
-		stake := rivalStake(c.CombatLevel)
+		stake := rivalStake(rivalLevelForUser(&c))
 		if stake <= 0 {
 			continue
 		}
@@ -327,7 +382,7 @@ func (p *AdventurePlugin) selectRivalPair() (*AdventureCharacter, *AdventureChar
 // ── Challenge Issuance ───────────────────────────────────────────────────────
 
 func (p *AdventurePlugin) issueRivalChallenge(challenger, challenged *AdventureCharacter) {
-	stake := rivalStake(challenged.CombatLevel)
+	stake := rivalStake(rivalLevelForUser(challenged))
 	challenge := &advRivalChallenge{
 		ChallengeID:  uuid.New().String()[:12],
 		ChallengerID: challenger.UserID,
@@ -756,40 +811,45 @@ func (p *AdventurePlugin) rivalChallengeTicker() {
 	// Roll the next challenge interval once. Re-roll after each issued challenge.
 	nextIntervalHours := rivalMinIntervalHours + rand.IntN(rivalMaxIntervalHours-rivalMinIntervalHours+1)
 
-	for range ticker.C {
-		now := time.Now().UTC()
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			now := time.Now().UTC()
 
-		// Only fire on the hour.
-		if now.Minute() != 0 {
-			continue
-		}
+			// Only fire on the hour.
+			if now.Minute() != 0 {
+				continue
+			}
 
-		// Only issue challenges between 08:00 and 22:00 UTC.
-		if now.Hour() < 8 || now.Hour() >= 22 {
-			// Still check for expiry outside challenge hours.
+			// Only issue challenges between 08:00 and 22:00 UTC.
+			if now.Hour() < 8 || now.Hour() >= 22 {
+				// Still check for expiry outside challenge hours.
+				p.expireRivalChallenges()
+				continue
+			}
+
+			// Expire old challenges first.
 			p.expireRivalChallenges()
-			continue
+
+			// Check if enough time has passed since last challenge.
+			last := lastRivalChallengeTime()
+			if !last.IsZero() && now.Sub(last) < time.Duration(nextIntervalHours)*time.Hour {
+				continue
+			}
+
+			// Try to issue a challenge.
+			challenger, challenged := p.selectRivalPair()
+			if challenger == nil || challenged == nil {
+				continue
+			}
+
+			p.issueRivalChallenge(challenger, challenged)
+
+			// Roll a fresh interval for the next challenge.
+			nextIntervalHours = rivalMinIntervalHours + rand.IntN(rivalMaxIntervalHours-rivalMinIntervalHours+1)
 		}
-
-		// Expire old challenges first.
-		p.expireRivalChallenges()
-
-		// Check if enough time has passed since last challenge.
-		last := lastRivalChallengeTime()
-		if !last.IsZero() && now.Sub(last) < time.Duration(nextIntervalHours)*time.Hour {
-			continue
-		}
-
-		// Try to issue a challenge.
-		challenger, challenged := p.selectRivalPair()
-		if challenger == nil || challenged == nil {
-			continue
-		}
-
-		p.issueRivalChallenge(challenger, challenged)
-
-		// Roll a fresh interval for the next challenge.
-		nextIntervalHours = rivalMinIntervalHours + rand.IntN(rivalMaxIntervalHours-rivalMinIntervalHours+1)
 	}
 }
 
@@ -801,10 +861,11 @@ func (p *AdventurePlugin) handleRivalsCmd(ctx MessageContext) error {
 		return err
 	}
 
-	if char.RivalPool == 0 {
+	pool, _, _ := loadRivalState(char.UserID)
+	if pool == 0 {
 		return p.SendReply(ctx.RoomID, ctx.EventID,
-			fmt.Sprintf("You need Combat Level %d to enter the rival pool. Currently: %d.",
-				rivalMinCombatLevel, char.CombatLevel))
+			fmt.Sprintf("You need Level %d to enter the rival pool. Currently: %d.",
+				rivalMinLevel, rivalLevelForUser(char)))
 	}
 
 	records, err := loadAllRivalRecords(char.UserID)

internal/plugin/adventure_robbie.go

@@ -31,29 +31,34 @@ func (p *AdventurePlugin) robbieTicker() {
 	ticker := time.NewTicker(1 * time.Minute)
 	defer ticker.Stop()
 
-	for range ticker.C {
-		now := time.Now().UTC()
-		dateKey := now.Format("2006-01-02")
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			now := time.Now().UTC()
+			dateKey := now.Format("2006-01-02")
 
-		// At midnight (or first tick of the day), pick today's target hour.
-		if robbieTargetDay != dateKey {
-			robbieTargetHour = 8 + rand.IntN(14) // 8–21 inclusive
-			robbieTargetDay = dateKey
-			slog.Info("adventure: robbie target hour set", "hour", robbieTargetHour, "date", dateKey)
+			// At midnight (or first tick of the day), pick today's target hour.
+			if robbieTargetDay != dateKey {
+				robbieTargetHour = 8 + rand.IntN(14) // 8–21 inclusive
+				robbieTargetDay = dateKey
+				slog.Info("adventure: robbie target hour set", "hour", robbieTargetHour, "date", dateKey)
+			}
+
+			if now.Hour() < robbieTargetHour {
+				continue
+			}
+
+			jobName := "adventure_robbie"
+			if db.JobCompleted(jobName, dateKey) {
+				continue
+			}
+
+			slog.Info("adventure: robbie sweep starting")
+			p.robbieVisitAll()
+			db.MarkJobCompleted(jobName, dateKey)
 		}
-
-		if now.Hour() < robbieTargetHour {
-			continue
-		}
-
-		jobName := "adventure_robbie"
-		if db.JobCompleted(jobName, dateKey) {
-			continue
-		}
-
-		slog.Info("adventure: robbie sweep starting")
-		p.robbieVisitAll()
-		db.MarkJobCompleted(jobName, dateKey)
 	}
 }
 
@@ -78,7 +83,8 @@ func (p *AdventurePlugin) robbieVisitAll() {
 			time.Sleep(time.Duration(1000+rand.IntN(2000)) * time.Millisecond)
 		}
 
-		p.robbieVisitPlayer(char.UserID, char.DisplayName)
+		name, _ := loadDisplayName(char.UserID)
+		p.robbieVisitPlayer(char.UserID, name)
 	}
 }
 
@@ -163,6 +169,7 @@ func (p *AdventurePlugin) robbieVisitPlayer(userID id.UserID, displayName string
 	if err == nil {
 		char.RobbieVisitCount++
 		_ = saveAdvCharacter(char)
+		_ = upsertPlayerMetaNPCState(userID, npcStateFromAdvChar(char))
 	}
 
 	// Send DM

internal/plugin/adventure_scheduler.go

@@ -18,21 +18,26 @@ func (p *AdventurePlugin) morningTicker() {
 	ticker := time.NewTicker(1 * time.Minute)
 	defer ticker.Stop()
 
-	for range ticker.C {
-		now := time.Now().UTC()
-		if now.Hour() != p.morningHour || now.Minute() != 0 {
-			continue
-		}
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			now := time.Now().UTC()
+			if now.Hour() != p.morningHour || now.Minute() != 0 {
+				continue
+			}
 
-		dateKey := now.Format("2006-01-02")
-		jobName := "adventure_morning"
-		if db.JobCompleted(jobName, dateKey) {
-			continue
-		}
+			dateKey := now.Format("2006-01-02")
+			jobName := "adventure_morning"
+			if db.JobCompleted(jobName, dateKey) {
+				continue
+			}
 
-		slog.Info("adventure: sending morning DMs")
-		p.sendMorningDMs()
-		db.MarkJobCompleted(jobName, dateKey)
+			slog.Info("adventure: sending morning DMs")
+			p.sendMorningDMs()
+			db.MarkJobCompleted(jobName, dateKey)
+		}
 	}
 }
 
@@ -73,25 +78,55 @@ func (p *AdventurePlugin) sendMorningDMs() {
 			}
 
 			// Send respawn DM
-			text := renderAdvRespawnDM(&char)
+			text := renderAdvRespawnDM(char.UserID)
 			if err := p.SendDM(char.UserID, text); err != nil {
 				slog.Error("adventure: failed to send respawn DM", "user", char.UserID, "err", err)
 			}
+
+			// Emergence seam (death case): a player who died underground
+			// "comes home" on respawn. This is the deferred half of the
+			// emergence roll — survived extractions roll at their exit
+			// site; deaths roll here. See maybeRollPetArrivalOnEmerge.
+			p.maybeRollPetArrivalOnEmerge(char.UserID)
 		}
 
-		// Babysitting: auto-resolve daily action, skip DM
+		// Babysitting: pet-care trickle (no harvest actions; safe-rest perk
+		// is consumed inside the expedition camp/rest path). Still skips the
+		// morning DM — the babysitter is handling things in the background.
 		if char.BabysitActive {
 			if !char.Alive {
-				// Dead and not yet ready to respawn — skip babysit action
 				continue
 			}
-			p.runBabysitDaily(&char)
+			p.runBabysitDailyTrickle(&char)
+			if err := saveAdvCharacter(&char); err != nil {
+				slog.Error("babysit: failed to save after daily trickle", "user", char.UserID, "err", err)
+			}
 			continue
 		}
 
+		// Mid-fight: a turn-based elite/boss session locks the run. The
+		// per-round combat DMs are the player's feed right now — don't talk
+		// over them with the overworld morning menu. (A combat session always
+		// sits inside an active expedition, so the expedition skip below would
+		// usually catch this too; the explicit guard is cheap insurance.)
+		if char.Alive && hasActiveCombatSession(char.UserID) {
+			continue
+		}
+
+		// Active expedition: the expedition cycle delivers its own morning
+		// briefing at 06:00 UTC (deliverBriefing). The legacy overworld
+		// morning DM is irrelevant — and confusing — while underground.
+		if char.Alive {
+			if exp, err := getActiveExpedition(char.UserID); err != nil {
+				slog.Warn("adventure: failed to check active expedition for morning DM", "user", char.UserID, "err", err)
+			} else if exp != nil {
+				continue
+			}
+		}
+
 		// If still dead, send death status
 		if !char.Alive {
-			text := renderAdvDeathStatusDM(&char)
+			text := renderAdvDeathStatusDM(char.UserID)
 			if err := p.SendDM(char.UserID, text); err != nil {
 				slog.Error("adventure: failed to send death status DM", "user", char.UserID, "err", err)
 			}
@@ -104,14 +139,15 @@ func (p *AdventurePlugin) sendMorningDMs() {
 			continue
 		}
 
-		// Pet arrival check (fires before normal morning DM)
-		if petShouldArrive(&char) {
-			p.petArrivalDM(char.UserID)
-			continue
-		}
+		// Pet arrival no longer rolls here. The 08:00 overworld morning DM
+		// is skipped for anyone underground (expedition gate above), so it
+		// never reached expedition players. Arrival now fires on the
+		// emergence seam — see maybeRollPetArrivalOnEmerge, called from the
+		// extract/abandon/forced-extract and respawn paths.
+		pet, _ := loadPetState(char.UserID)
 
 		// Morning pet event
-		petEvent := petMorningEvent(&char)
+		petEvent := petMorningEvent(pet)
 		if petEvent != "" {
 			char.PetMorningDefense = true
 			_ = saveAdvCharacter(&char)
@@ -133,7 +169,7 @@ func (p *AdventurePlugin) sendMorningDMs() {
 		if isHol {
 			holidayLabel = holName
 		}
-		text := renderAdvMorningDM(&char, equip, balance, bonuses, holidayLabel)
+		text := renderAdvMorningDM(char.UserID, equip, balance, bonuses, holidayLabel)
 		if petEvent != "" {
 			text = fmt.Sprintf("🐾 *%s*\n\n%s", petEvent, text)
 		}
@@ -154,21 +190,26 @@ func (p *AdventurePlugin) summaryTicker() {
 	ticker := time.NewTicker(1 * time.Minute)
 	defer ticker.Stop()
 
-	for range ticker.C {
-		now := time.Now().UTC()
-		if now.Hour() != p.summaryHour || now.Minute() != 0 {
-			continue
-		}
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			now := time.Now().UTC()
+			if now.Hour() != p.summaryHour || now.Minute() != 0 {
+				continue
+			}
 
-		dateKey := now.Format("2006-01-02")
-		jobName := "adventure_summary"
-		if db.JobCompleted(jobName, dateKey) {
-			continue
-		}
+			dateKey := now.Format("2006-01-02")
+			jobName := "adventure_summary"
+			if db.JobCompleted(jobName, dateKey) {
+				continue
+			}
 
-		slog.Info("adventure: posting daily summary")
-		p.postDailySummary()
-		db.MarkJobCompleted(jobName, dateKey)
+			slog.Info("adventure: posting daily summary")
+			p.postDailySummary()
+			db.MarkJobCompleted(jobName, dateKey)
+		}
 	}
 }
 
@@ -189,28 +230,25 @@ func (p *AdventurePlugin) postDailySummary() {
 		return
 	}
 
-	// Load logs for today and yesterday — players may act across the UTC boundary
+	// Load activity for today and yesterday — players may act across the UTC
+	// boundary. Activity unifies legacy adventure_activity_log + dnd_zone_run
+	// + dnd_expedition_log so the report sees every action regardless of
+	// which subsystem produced it.
 	now := time.Now().UTC()
-	todayLogs, _ := loadAdvLogsForDate(now.Format("2006-01-02"))
-	yesterdayLogs, _ := loadAdvLogsForDate(now.AddDate(0, 0, -1).Format("2006-01-02"))
-	todayLogs = append(todayLogs, yesterdayLogs...)
-	// Group logs per user — holiday days may produce 2 entries per user
-	logsPerUser := make(map[id.UserID][]*AdvDayLog)
-	for i := range todayLogs {
-		uid := todayLogs[i].UserID
-		logsPerUser[uid] = append(logsPerUser[uid], &todayLogs[i])
+	todayActs, _ := loadAdvDailyActivity(now.Format("2006-01-02"))
+	yesterdayActs, _ := loadAdvDailyActivity(now.AddDate(0, 0, -1).Format("2006-01-02"))
+	activityMap := make(map[id.UserID][]AdvDailyActivity)
+	for uid, e := range yesterdayActs {
+		activityMap[uid] = append(activityMap[uid], e...)
+	}
+	for uid, e := range todayActs {
+		activityMap[uid] = append(activityMap[uid], e...)
 	}
-	// logMap picks the last (most recent) log entry for summary display
-	// lootSums aggregates loot across all actions (relevant on holiday double-action days)
-	logMap := make(map[id.UserID]*AdvDayLog)
 	lootSums := make(map[id.UserID]int64)
-	for uid, logs := range logsPerUser {
-		logMap[uid] = logs[len(logs)-1]
-		var total int64
-		for _, l := range logs {
-			total += l.LootValue
+	for uid, acts := range activityMap {
+		for _, a := range acts {
+			lootSums[uid] += a.LootValue
 		}
-		lootSums[uid] = total
 	}
 
 	isHol, holName := isHolidayToday()
@@ -218,37 +256,66 @@ func (p *AdventurePlugin) postDailySummary() {
 	// Build player summaries
 	var players []AdvPlayerDaySummary
 	for _, c := range chars {
+		dispName, _ := loadDisplayName(c.UserID)
 		ps := AdvPlayerDaySummary{
-			DisplayName:   c.DisplayName,
-			CombatLevel:   c.CombatLevel,
+			DisplayName:   dispName,
+			Level:         c.CombatLevel,
 			MiningSkill:   c.MiningSkill,
 			ForagingSkill: c.ForagingSkill,
 			FishingSkill:  c.FishingSkill,
 		}
+		if dnd, _ := LoadDnDCharacter(c.UserID); dnd != nil {
+			ps.HasDnDChar = true
+			ps.DnDLevel = dnd.Level
+			ps.DnDRace = string(dnd.Race)
+			ps.DnDClass = string(dnd.Class)
+			ps.HPCurrent = dnd.HPCurrent
+			ps.HPMax = dnd.HPMax
+		}
 
-		// Holiday action count from log entries
+		acts := activityMap[c.UserID]
+
+		// Holiday action count from activity entries
 		if isHol {
-			ps.HolidayActions = len(logsPerUser[c.UserID])
+			ps.HolidayActions = len(acts)
 		}
 
 		if !c.Alive {
 			ps.IsDead = true
+			ps.DeathSource = c.DeathSource
+			ps.DeathLocation = c.DeathLocation
 			if c.DeadUntil != nil {
 				ps.DeadUntil = c.DeadUntil.Format("15:04") + " UTC"
+				remaining := time.Until(*c.DeadUntil)
+				if remaining > 0 {
+					hrs := int(remaining.Hours())
+					mins := int(remaining.Minutes()) - hrs*60
+					// {hours}: round half-up integer hours.
+					ps.DeadUntilHours = int(remaining.Hours() + 0.5)
+					// {duration}: precise — "5h 27m", "47m", "2h".
+					switch {
+					case hrs > 0 && mins > 0:
+						ps.DeadUntilDuration = fmt.Sprintf("%dh %dm", hrs, mins)
+					case hrs > 0:
+						ps.DeadUntilDuration = fmt.Sprintf("%dh", hrs)
+					default:
+						ps.DeadUntilDuration = fmt.Sprintf("%dm", mins)
+					}
+				}
 			}
-			// Check if they died today
-			if log, ok := logMap[c.UserID]; ok {
-				ps.Activity = log.ActivityType
-				ps.Location = log.Location
-				ps.Outcome = log.Outcome
-				ps.LootValue = lootSums[c.UserID] // aggregate across all actions
-				ps.SummaryLine = advSummaryOneLiner(c.UserID, AdvActivityType(log.ActivityType), AdvOutcomeType(log.Outcome), lootSums[c.UserID], log.Location)
+			if len(acts) > 0 {
+				last := acts[len(acts)-1]
+				ps.Activity = last.Activity
+				ps.Location = last.Location
+				ps.Outcome = last.Outcome
+				ps.LootValue = lootSums[c.UserID]
+				ps.SummaryLine = last.Summary
 			}
 			players = append(players, ps)
 			continue
 		}
 
-		if !c.HasActedToday() {
+		if len(acts) == 0 {
 			ps.IsResting = true
 			if len(SummaryResting) > 0 {
 				ps.SummaryLine = SummaryResting[time.Now().Nanosecond()%len(SummaryResting)]
@@ -257,14 +324,13 @@ func (p *AdventurePlugin) postDailySummary() {
 			continue
 		}
 
-		// Active player with today's log
-		if log, ok := logMap[c.UserID]; ok {
-			ps.Activity = log.ActivityType
-			ps.Location = log.Location
-			ps.Outcome = log.Outcome
-			ps.LootValue = lootSums[c.UserID] // aggregate across all actions
-			ps.SummaryLine = advSummaryOneLiner(c.UserID, AdvActivityType(log.ActivityType), AdvOutcomeType(log.Outcome), lootSums[c.UserID], log.Location)
-		}
+		// Active player — represent with most-recent activity row.
+		last := acts[len(acts)-1]
+		ps.Activity = last.Activity
+		ps.Location = last.Location
+		ps.Outcome = last.Outcome
+		ps.LootValue = lootSums[c.UserID]
+		ps.SummaryLine = last.Summary
 
 		players = append(players, ps)
 	}
@@ -301,114 +367,126 @@ func (p *AdventurePlugin) midnightTicker() {
 
 	lastRanDate := ""
 
-	for range ticker.C {
-		dateKey := time.Now().UTC().Format("2006-01-02")
-		if dateKey == lastRanDate {
-			continue
-		}
+	for {
+		select {
+		case <-p.stopCh:
+			return
+		case <-ticker.C:
+			dateKey := time.Now().UTC().Format("2006-01-02")
+			if dateKey == lastRanDate {
+				continue
+			}
 
-		// New UTC day — check DB in case we already ran (e.g. bot restart).
-		jobName := "adventure_midnight"
-		if db.JobCompleted(jobName, dateKey) {
+			// New UTC day — check DB in case we already ran (e.g. bot restart).
+			jobName := "adventure_midnight"
+			if db.JobCompleted(jobName, dateKey) {
+				lastRanDate = dateKey
+				continue
+			}
+
+			slog.Info("adventure: midnight reset")
+			if err := p.midnightReset(); err != nil {
+				slog.Error("adventure: midnight reset failed, will retry next tick", "err", err)
+				continue
+			}
+			db.MarkJobCompleted(jobName, dateKey)
 			lastRanDate = dateKey
-			continue
 		}
-
-		slog.Info("adventure: midnight reset")
-		if err := p.midnightReset(); err != nil {
-			slog.Error("adventure: midnight reset failed, will retry next tick", "err", err)
-			continue
-		}
-		db.MarkJobCompleted(jobName, dateKey)
-		lastRanDate = dateKey
 	}
 }
 
 func (p *AdventurePlugin) midnightReset() error {
-	// Send idle shame DMs to players who didn't act
 	chars, err := loadAllAdvCharacters()
 	if err != nil {
 		return fmt.Errorf("load chars: %w", err)
 	}
 
 	today := time.Now().UTC().Format("2006-01-02")
+	yesterday := time.Now().UTC().Add(-24 * time.Hour).Format("2006-01-02")
+
+	// Unified activity oracle — same source the daily report uses. Unions
+	// adventure_activity_log + dnd_zone_run + dnd_expedition_log, so
+	// background-autopilot walks, expedition extracts/completions, and any
+	// subsystem that logged a beat all count as "something happened on this
+	// player's behalf." LastActionDate alone misses the autopilot path
+	// (dnd_zone_cmd.go gates markActedToday on !compact to keep autopilot
+	// out of streak credit) — without this oracle, a player who let the
+	// autopilot run a full expedition gets shamed at midnight.
+	todayActs, _ := loadAdvDailyActivity(today)
+	yesterdayActs, _ := loadAdvDailyActivity(yesterday)
 
 	dmsSent := 0
 	for _, char := range chars {
-		if !char.HasActedToday() {
-			// If the player died today or yesterday, they couldn't act — no shame,
-			// no streak reset. This covers both currently-dead players and players
-			// who were just revived at midnight (Alive already flipped to true by
-			// the reminder loop before midnightReset runs).
-			if char.LastDeathDate == today ||
-				char.LastDeathDate == time.Now().UTC().Add(-24*time.Hour).Format("2006-01-02") {
-				continue
-			}
+		// Died inside the window — no shame, no streak change. Covers both
+		// currently-dead players and players revived at midnight (Alive
+		// already flipped to true by the reminder loop before this runs).
+		if char.LastDeathDate == today || char.LastDeathDate == yesterday {
+			continue
+		}
 
-			// Auto-babysit: if enabled, alive, and affordable, run a single babysit day instead of losing streak
-			if char.AutoBabysit && char.Alive && !char.BabysitActive {
-				daily := babysitDailyCost(char.CombatLevel)
-				if p.euro.GetBalance(char.UserID) >= float64(daily) {
-					if p.euro.Debit(char.UserID, float64(daily), "auto_babysit") {
-						p.runAutoBabysitDay(&char)
-						if char.CurrentStreak > 0 {
-							char.CurrentStreak++
-							if char.CurrentStreak > char.BestStreak {
-								char.BestStreak = char.CurrentStreak
-							}
-						} else {
-							char.CurrentStreak = 1
-						}
-						_ = saveAdvCharacter(&char)
+		// Player-initiated engagement — only this credits the streak.
+		// LastActionDate is stamped at action time by markActedToday + !rest;
+		// the legacy counters get bumped by the legacy CanDo... paths.
+		engaged := char.LastActionDate == today || char.LastActionDate == yesterday ||
+			char.CombatActionsUsed > 0 || char.HarvestActionsUsed > 0
 
-						if p.achievements != nil {
-							p.achievements.GrantAchievement(char.UserID, "adv_auto_babysit")
-						}
-
-						if dmsSent > 0 {
-							time.Sleep(time.Duration(1000+rand.IntN(2000)) * time.Millisecond)
-						}
-						dmsSent++
-						p.SendDM(char.UserID, fmt.Sprintf("🍼 **Auto-babysit activated** — €%d deducted. Your streak is safe at %d days.", daily, char.CurrentStreak))
-						continue
-					}
-				}
-			}
-
-			// Jitter between DMs to avoid Matrix rate limits
-			if dmsSent > 0 {
-				time.Sleep(time.Duration(1000+rand.IntN(2000)) * time.Millisecond)
-			}
-			dmsSent++
-
-			// Idle shame DM
-			text := renderAdvIdleShameDM(&char)
-			if char.CurrentStreak > 0 {
-				oldStreak := char.CurrentStreak
-				char.CurrentStreak /= 2
-				char.StreakDecayed = true
-				text += fmt.Sprintf("\n\n🔥 Streak: %d → %d days", oldStreak, char.CurrentStreak)
-				if char.CurrentStreak > 0 {
-					text += " — not all is lost."
-				}
-				_ = saveAdvCharacter(&char)
-			}
-			if err := p.SendDM(char.UserID, text); err != nil {
-				slog.Error("adventure: failed to send idle shame DM", "user", char.UserID, "err", err)
-			}
-		} else {
-			// Update streak — LastActionDate was set at action time
-			yesterday := time.Now().UTC().Add(-24 * time.Hour).Format("2006-01-02")
+		if engaged {
 			if char.LastActionDate == yesterday || char.LastActionDate == today {
 				char.CurrentStreak++
 			} else {
-				// Gap in activity — start fresh
+				// Legacy-only path: counters bumped but LastActionDate stale.
+				// Without this fall-through the streak would reset to 1 every
+				// night even with continuous play.
 				char.CurrentStreak = 1
 			}
 			if char.CurrentStreak > char.BestStreak {
 				char.BestStreak = char.CurrentStreak
 			}
+			char.LastActionDate = today
 			_ = saveAdvCharacter(&char)
+			continue
+		}
+
+		// Activity happened on the player's behalf without an explicit tap —
+		// autopilot walked rooms, expedition log gained beats, a fight session
+		// is still locked open. Hold the streak: no bump, no shame, no decay.
+		// The player engaged earlier to kick this off; autopilot is a feature,
+		// not a way to game streaks, and absence of taps shouldn't strip
+		// progress they earned through real play.
+		if len(todayActs[char.UserID]) > 0 || len(yesterdayActs[char.UserID]) > 0 {
+			continue
+		}
+		// Safety net for live state the activity logs don't reflect yet
+		// (e.g. an active expedition that's been quiet today, or a combat
+		// session locked open across midnight without a log append).
+		if exp, err := getActiveExpedition(char.UserID); err != nil {
+			slog.Warn("adventure: failed to check active expedition for idle reaper", "user", char.UserID, "err", err)
+		} else if exp != nil {
+			continue
+		}
+		if hasActiveCombatSession(char.UserID) {
+			continue
+		}
+
+		// Truly idle — shame DM + streak halve.
+		if dmsSent > 0 {
+			time.Sleep(time.Duration(1000+rand.IntN(2000)) * time.Millisecond)
+		}
+		dmsSent++
+
+		text := renderAdvIdleShameDM(char.UserID)
+		if char.CurrentStreak > 0 {
+			oldStreak := char.CurrentStreak
+			char.CurrentStreak /= 2
+			char.StreakDecayed = true
+			text += fmt.Sprintf("\n\n🔥 Streak: %d → %d days", oldStreak, char.CurrentStreak)
+			if char.CurrentStreak > 0 {
+				text += " — not all is lost."
+			}
+			_ = saveAdvCharacter(&char)
+		}
+		if err := p.SendDM(char.UserID, text); err != nil {
+			slog.Error("adventure: failed to send idle shame DM", "user", char.UserID, "err", err)
 		}
 	}
 
@@ -416,23 +494,22 @@ func (p *AdventurePlugin) midnightReset() error {
 	// from concurrent writers (e.g. reminder fire loop).
 	var resetErr error
 	for attempt := 0; attempt < 3; attempt++ {
-		if resetErr = resetAllAdvDailyActions(); resetErr == nil {
+		if resetErr = resetAllPlayerMetaDailyActions(); resetErr == nil {
 			break
 		}
 		slog.Warn("adventure: daily action reset failed, retrying", "attempt", attempt+1, "err", resetErr)
 		time.Sleep(time.Duration(attempt+1) * 2 * time.Second)
 	}
-	if resetErr == nil {
-		// Re-lock combat for active co-op participants after the universal
-		// reset would otherwise have given them a fresh combat action.
-		if err := lockCoopCombatActions(); err != nil {
-			slog.Error("adventure: post-reset coop combat lock failed", "err", err)
-		}
-	}
 	if resetErr != nil {
 		return fmt.Errorf("reset daily actions after 3 attempts: %w", resetErr)
 	}
 
+	// Clear the one-day pet morning-defense buff so it re-rolls fresh each
+	// morning (briefing or overworld DM) instead of leaking permanently.
+	if err := resetAllPetMorningDefense(); err != nil {
+		slog.Error("adventure: failed to reset pet morning defense", "err", err)
+	}
+
 	// Prune expired buffs
 	if err := pruneAdvExpiredBuffs(); err != nil {
 		slog.Error("adventure: failed to prune expired buffs", "err", err)

internal/plugin/adventure_scheduler_test.go

@@ -0,0 +1,145 @@
+package plugin
+
+import (
+	"testing"
+	"time"
+
+	"gogobee/internal/db"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// TestMidnightReset_Branching exercises the three idle-reaper branches:
+//   - engaged: LastActionDate stamped today/yesterday → streak bumps
+//   - activity-without-tap: autopilot/background activity logged today but
+//     no LastActionDate stamp → streak holds, no shame DM, no decay
+//   - truly idle: nothing anywhere → streak halves, StreakDecayed=true
+//
+// Regression guard for the autopilot bug: a player who let the background
+// auto-run walk an expedition all day used to get shamed at midnight because
+// markActedToday is gated on !compact at dnd_zone_cmd.go.
+func TestMidnightReset_Branching(t *testing.T) {
+	dir := t.TempDir()
+	db.Close()
+	if err := db.Init(dir); err != nil {
+		t.Fatalf("db.Init: %v", err)
+	}
+	t.Cleanup(db.Close)
+
+	today := time.Now().UTC().Format("2006-01-02")
+	yesterday := time.Now().UTC().Add(-24 * time.Hour).Format("2006-01-02")
+
+	mk := func(uid, lastAction string, streak int) id.UserID {
+		u := id.UserID(uid)
+		if err := createAdvCharacter(u, uid); err != nil {
+			t.Fatalf("createAdvCharacter %s: %v", uid, err)
+		}
+		c, err := loadAdvCharacter(u)
+		if err != nil {
+			t.Fatalf("load %s: %v", uid, err)
+		}
+		c.LastActionDate = lastAction
+		c.CurrentStreak = streak
+		c.BestStreak = streak
+		if err := saveAdvCharacter(c); err != nil {
+			t.Fatalf("save %s: %v", uid, err)
+		}
+		return u
+	}
+
+	engaged := mk("@engaged:example", yesterday, 5)
+	autopilot := mk("@autopilot:example", "2020-01-01", 7)
+	idle := mk("@idle:example", "2020-01-01", 8)
+
+	// Simulate autopilot activity: a legacy activity-log row dated today.
+	// loadAdvDailyActivity unions this in, so the reaper sees the player as
+	// "had activity" without their LastActionDate being current.
+	if _, err := db.Get().Exec(
+		`INSERT INTO adventure_activity_log
+		 (user_id, activity_type, location, outcome, loot_value, xp_gained, flavor_key, logged_at)
+		 VALUES (?, 'zone', 'Test Zone', 'in_progress', 0, 0, '', CURRENT_TIMESTAMP)`,
+		string(autopilot),
+	); err != nil {
+		t.Fatalf("insert activity row: %v", err)
+	}
+
+	p := &AdventurePlugin{}
+	if err := p.midnightReset(); err != nil {
+		t.Fatalf("midnightReset: %v", err)
+	}
+
+	// Engaged → streak bumped, LastActionDate restamped to today, no decay.
+	if c, _ := loadAdvCharacter(engaged); c != nil {
+		if c.CurrentStreak != 6 {
+			t.Errorf("engaged: streak = %d, want 6", c.CurrentStreak)
+		}
+		if c.LastActionDate != today {
+			t.Errorf("engaged: LastActionDate = %q, want %q", c.LastActionDate, today)
+		}
+		if c.StreakDecayed {
+			t.Error("engaged: StreakDecayed = true, want false")
+		}
+	}
+
+	// Autopilot → hold. Streak unchanged, LastActionDate stays stale, no decay.
+	if c, _ := loadAdvCharacter(autopilot); c != nil {
+		if c.CurrentStreak != 7 {
+			t.Errorf("autopilot: streak = %d, want 7 (held)", c.CurrentStreak)
+		}
+		if c.StreakDecayed {
+			t.Error("autopilot: StreakDecayed = true, want false (shamed by mistake)")
+		}
+		if c.LastActionDate == today {
+			t.Errorf("autopilot: LastActionDate restamped to today — autopilot must not credit streak via LastActionDate")
+		}
+	}
+
+	// Idle → shame DM (no-op without Matrix client) + streak halved + decay flagged.
+	if c, _ := loadAdvCharacter(idle); c != nil {
+		if c.CurrentStreak != 4 {
+			t.Errorf("idle: streak = %d, want 4 (halved from 8)", c.CurrentStreak)
+		}
+		if !c.StreakDecayed {
+			t.Error("idle: StreakDecayed = false, want true")
+		}
+	}
+}
+
+// TestMidnightReset_DeathWindowSkips: a player who died today/yesterday is
+// left untouched — no shame, no streak change, no decay flag.
+func TestMidnightReset_DeathWindowSkips(t *testing.T) {
+	dir := t.TempDir()
+	db.Close()
+	if err := db.Init(dir); err != nil {
+		t.Fatalf("db.Init: %v", err)
+	}
+	t.Cleanup(db.Close)
+
+	today := time.Now().UTC().Format("2006-01-02")
+
+	u := id.UserID("@dead:example")
+	if err := createAdvCharacter(u, "dead"); err != nil {
+		t.Fatalf("createAdvCharacter: %v", err)
+	}
+	c, _ := loadAdvCharacter(u)
+	c.LastActionDate = "2020-01-01"
+	c.CurrentStreak = 10
+	c.BestStreak = 10
+	c.LastDeathDate = today
+	if err := saveAdvCharacter(c); err != nil {
+		t.Fatalf("save: %v", err)
+	}
+
+	p := &AdventurePlugin{}
+	if err := p.midnightReset(); err != nil {
+		t.Fatalf("midnightReset: %v", err)
+	}
+
+	got, _ := loadAdvCharacter(u)
+	if got.CurrentStreak != 10 {
+		t.Errorf("dead: streak = %d, want 10 (untouched)", got.CurrentStreak)
+	}
+	if got.StreakDecayed {
+		t.Error("dead: StreakDecayed = true, want false")
+	}
+}

internal/plugin/adventure_shop.go

@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"math"
 	"math/rand/v2"
+	"sort"
 	"strings"
 	"time"
 
@@ -61,8 +62,17 @@ type advPendingShopConfirm struct {
 type advShopSession struct {
 	StartedAt   time.Time
 	ItemsBought int
+	// Persuasion discount: 0.10 if the player passed Persuasion DC 15 on
+	// session start, else 0. Applied to all purchases this session.
+	// Expires `dndPersuasionDiscountTTL` after StartedAt — players can't
+	// hold a discount session open indefinitely.
+	PersuasionDiscount float64
 }
 
+// dndPersuasionDiscountTTL — how long after shop entry the Persuasion
+// discount remains valid. After this, prices return to full.
+const dndPersuasionDiscountTTL = 30 * time.Minute
+
 func (p *AdventurePlugin) shopSessionGet(userID id.UserID) *advShopSession {
 	if val, ok := p.shopSessions.Load(string(userID)); ok {
 		return val.(*advShopSession)
@@ -72,12 +82,45 @@ func (p *AdventurePlugin) shopSessionGet(userID id.UserID) *advShopSession {
 
 func (p *AdventurePlugin) shopSessionStart(userID id.UserID) {
 	if p.shopSessionGet(userID) == nil {
+		discount := 0.0
+		if dndNPCPersuasionDiscount(userID) {
+			discount = 0.10
+		}
 		p.shopSessions.Store(string(userID), &advShopSession{
-			StartedAt: time.Now(),
+			StartedAt:          time.Now(),
+			PersuasionDiscount: discount,
 		})
 	}
 }
 
+// shopSessionPriceFactor returns the multiplier to apply to shop prices for
+// the given user's current session. 1.0 normally, 0.9 if Persuasion passed.
+// The discount expires after dndPersuasionDiscountTTL to prevent indefinite
+// session-holding (audit fix G).
+func (p *AdventurePlugin) shopSessionPriceFactor(userID id.UserID) float64 {
+	sess := p.shopSessionGet(userID)
+	if sess == nil {
+		return 1.0
+	}
+	if sess.PersuasionDiscount > 0 && time.Since(sess.StartedAt) > dndPersuasionDiscountTTL {
+		return 1.0
+	}
+	return 1.0 - sess.PersuasionDiscount
+}
+
+// shopSessionAnnounceDiscount returns flavor text to surface a passed
+// Persuasion check, or empty string if none/expired.
+func (p *AdventurePlugin) shopSessionAnnounceDiscount(userID id.UserID) string {
+	sess := p.shopSessionGet(userID)
+	if sess == nil || sess.PersuasionDiscount <= 0 {
+		return ""
+	}
+	if time.Since(sess.StartedAt) > dndPersuasionDiscountTTL {
+		return ""
+	}
+	return "_(Persuasion DC 15 passed — 10% discount applied; expires 30 minutes after shop entry.)_"
+}
+
 func (p *AdventurePlugin) shopSessionBump(userID id.UserID) {
 	sess := p.shopSessionGet(userID)
 	if sess != nil {
@@ -151,9 +194,12 @@ func luigiShopGreeting(userID id.UserID, equip map[EquipmentSlot]*AdvEquipment,
 	sb.WriteString(fmt.Sprintf("🛒 **Luigi's**\n💰 Balance: €%.0f\n\n", balance))
 	sb.WriteString(fmt.Sprintf("*%s*\n\n", greet))
 
+	// Two-column grid; the Exit chip squares the layout so Curios doesn't
+	// dangle on its own row and players have a one-word out from here.
 	sb.WriteString("⚔️  Weapons       🛡️  Armor\n")
 	sb.WriteString("🪖  Helmets       👢  Boots\n")
-	sb.WriteString("⛏️  Tools         🧪  Supplies\n\n")
+	sb.WriteString("⛏️  Tools         🧪  Supplies\n")
+	sb.WriteString("🔮  Curios        🚪  Exit\n\n")
 
 	if showAll {
 		flavor, _ := advPickFlavor(luigiShowAllComment, userID, "luigi_showall")
@@ -339,11 +385,25 @@ func (p *AdventurePlugin) resolveShopCategoryChoice(ctx MessageContext, interact
 		return p.SendDM(ctx.Sender, text)
 	}
 
+	// Curios — Open5e magic items, daily rotating stock.
+	if reply == "curios" || reply == "curio" || reply == "magic" || reply == "trinkets" {
+		balance := p.euro.GetBalance(ctx.Sender)
+		text := p.luigiCuriosView(ctx.Sender, balance)
+		p.pending.Store(string(ctx.Sender), &advPendingInteraction{
+			Type:      "shop_curio",
+			Data:      data,
+			ExpiresAt: time.Now().Add(advDMResponseWindow),
+		})
+		p.advMarkMenuSent(ctx.Sender)
+		p.shopScheduleBrowseNudge(ctx.Sender)
+		return p.SendDM(ctx.Sender, text)
+	}
+
 	slot := advParseShopCategory(reply)
 	if slot == "" {
 		// Re-store pending and reprompt.
 		p.pending.Store(string(ctx.Sender), interaction)
-		return p.SendDM(ctx.Sender, "I didn't catch that. Reply with a category: weapons, armor, helmets, boots, tools, or supplies.")
+		return p.SendDM(ctx.Sender, "I didn't catch that. Reply with a category: weapons, armor, helmets, boots, tools, supplies, or curios.")
 	}
 
 	_, equip, err := p.ensureCharacter(ctx.Sender)
@@ -486,19 +546,22 @@ func (p *AdventurePlugin) resolveShopConfirm(ctx MessageContext, interaction *ad
 		return p.SendDM(ctx.Sender, fmt.Sprintf("Your **%s** (Masterwork ⭐) is better than that T%d shop item.", current.Name, def.Tier))
 	}
 
+	// Persuasion-discounted price.
+	price := def.Price * p.shopSessionPriceFactor(ctx.Sender)
+
 	// Affordability.
-	if balance < def.Price {
+	if balance < price {
 		flavor, _ := advPickFlavor(luigiInsufficientFunds, ctx.Sender, "luigi_broke")
-		return p.SendDM(ctx.Sender, fmt.Sprintf("*%s*\n\nYou have €%.0f. %s costs €%.0f.", flavor, balance, def.Name, def.Price))
+		return p.SendDM(ctx.Sender, fmt.Sprintf("*%s*\n\nYou have €%.0f. %s costs €%.0f.", flavor, balance, def.Name, price))
 	}
 
 	// Debit.
-	if !p.euro.Debit(ctx.Sender, def.Price, "adventure_shop_"+string(data.Slot)) {
+	if !p.euro.Debit(ctx.Sender, price, "adventure_shop_"+string(data.Slot)) {
 		return p.SendDM(ctx.Sender, "Transaction failed. The economy is having a moment.")
 	}
 
 	// Community contribution: 5% of purchase price.
-	if potCut := int(def.Price * 0.05); potCut > 0 {
+	if potCut := int(price * 0.05); potCut > 0 {
 		communityPotAdd(potCut)
 		trackTaxPaid(ctx.Sender, potCut)
 	}
@@ -693,18 +756,19 @@ func (p *AdventurePlugin) advBuyEquipment(userID id.UserID, slot EquipmentSlot,
 			current.Name, current.Tier, def.Tier)
 	}
 
+	price := def.Price * p.shopSessionPriceFactor(userID)
 	balance := p.euro.GetBalance(userID)
-	if balance < def.Price {
+	if balance < price {
 		flavor, _ := advPickFlavor(luigiInsufficientFunds, userID, "luigi_broke")
-		return fmt.Sprintf("*%s*\n\nYou have €%.0f. %s costs €%.0f.", flavor, balance, def.Name, def.Price)
+		return fmt.Sprintf("*%s*\n\nYou have €%.0f. %s costs €%.0f.", flavor, balance, def.Name, price)
 	}
 
-	if !p.euro.Debit(userID, def.Price, "adventure_shop_"+string(slot)) {
+	if !p.euro.Debit(userID, price, "adventure_shop_"+string(slot)) {
 		return "Transaction failed. The economy is having a moment."
 	}
 
 	// Community contribution: 5% of purchase price.
-	if potCut := int(def.Price * 0.05); potCut > 0 {
+	if potCut := int(price * 0.05); potCut > 0 {
 		communityPotAdd(potCut)
 		trackTaxPaid(userID, potCut)
 	}
@@ -779,11 +843,19 @@ func (p *AdventurePlugin) advSellAll(userID id.UserID) string {
 	var sold int
 	var keptSpecial int
 	var keptConsumable int
+	var keptMagic int
 	for _, item := range items {
 		if item.Type == "MasterworkGear" || item.Type == "ArenaGear" || item.Type == "card" {
 			keptSpecial++
 			continue
 		}
+		if item.Type == "magic_item" {
+			// B1: magic items are bonded curios, not bulk loot — sell-all must
+			// never silently delete them. Route the player to !adventure
+			// equip-magic instead.
+			keptMagic++
+			continue
+		}
 		if item.Type == "consumable" {
 			keptConsumable++
 			continue
@@ -797,6 +869,10 @@ func (p *AdventurePlugin) advSellAll(userID id.UserID) string {
 
 	if sold == 0 {
 		switch {
+		case keptMagic > 0 && (keptSpecial > 0 || keptConsumable > 0):
+			return "Your inventory only contains special gear, curios, and/or consumables. The merchant won't touch any of it. Use `!adventure equip-magic` for curios, `!adventure equip` for gear, or `!adventure sell <name>` for individual consumables."
+		case keptMagic > 0:
+			return "Your inventory only contains curios (magic items). The merchant doesn't deal in those. Use `!adventure equip-magic` instead."
 		case keptSpecial > 0 && keptConsumable > 0:
 			return "Your inventory only contains special gear and consumables. The merchant won't touch any of it. Use `!adventure equip` for gear or `!adventure sell <name>` for individual consumables."
 		case keptSpecial > 0:
@@ -824,6 +900,9 @@ func (p *AdventurePlugin) advSellAll(userID id.UserID) string {
 	if keptConsumable > 0 {
 		msg += fmt.Sprintf("\n(%d consumable(s) kept — `sell all` doesn't touch them. Sell explicitly with `!adventure sell <name>`.)", keptConsumable)
 	}
+	if keptMagic > 0 {
+		msg += fmt.Sprintf("\n(%d curio(s) kept — `!adventure equip-magic` to bond them. The merchant wouldn't know what to do with them.)", keptMagic)
+	}
 	return msg
 }
 
@@ -839,6 +918,9 @@ func (p *AdventurePlugin) advSellItem(userID id.UserID, itemName string) string
 			if item.Type == "MasterworkGear" || item.Type == "ArenaGear" || item.Type == "card" {
 				return fmt.Sprintf("**%s** is special gear. The merchant won't touch it. Use `!adventure equip` to equip it.", item.Name)
 			}
+			if item.Type == "magic_item" {
+				return fmt.Sprintf("**%s** is a curio — the merchant doesn't deal in those. Use `!adventure equip-magic` to bond it instead.", item.Name)
+			}
 			if err := removeAdvInventoryItem(item.ID); err != nil {
 				return "Failed to sell that item."
 			}
@@ -871,14 +953,22 @@ func advInventoryDisplay(userID id.UserID) string {
 	sb.WriteString("🎒 **Inventory**\n\n")
 
 	var total int64
+	hasMagic := false
 	for _, item := range items {
-		if item.Type == "MasterworkGear" {
+		switch item.Type {
+		case "MasterworkGear":
 			sb.WriteString(fmt.Sprintf("  ⭐ %s (T%d Masterwork %s)\n", item.Name, item.Tier, slotTitle(item.Slot)))
-		} else if item.Type == "ArenaGear" {
+		case "ArenaGear":
 			sb.WriteString(fmt.Sprintf("  ⚔️ %s (T%d Arena %s)\n", item.Name, item.Tier, slotTitle(item.Slot)))
-		} else if item.Type == "card" {
+		case "card":
 			sb.WriteString(fmt.Sprintf("  🃏 %s\n", item.Name))
-		} else {
+		case "magic_item":
+			// Tag magic items so they read as a separate class — they don't
+			// behave like sellable loot, and the equip-magic footer below
+			// only fires when the player actually has one.
+			hasMagic = true
+			sb.WriteString(fmt.Sprintf("  🔮 %s (%s)\n", item.Name, magicItemRarityLabel(item.Tier)))
+		default:
 			sb.WriteString(fmt.Sprintf("  %s (T%d %s) — €%d\n", item.Name, item.Tier, item.Type, item.Value))
 			total += item.Value
 		}
@@ -886,9 +976,31 @@ func advInventoryDisplay(userID id.UserID) string {
 	sb.WriteString(fmt.Sprintf("\n%d items — sellable value ~€%d", len(items), total))
 	sb.WriteString("\n\nTo sell: `!adventure sell all` or `!adventure sell <item>`")
 	sb.WriteString("\nTo equip Masterwork gear: `!adventure equip`")
+	if hasMagic {
+		sb.WriteString("\nTo wear a 🔮 curio: `!adventure equip-magic`")
+	}
 	return sb.String()
 }
 
+// magicItemRarityLabel pretty-prints the tier number magic items use as a
+// rarity stand-in. Inventory is the only surface that sees the bare tier;
+// the shop builds its rarity string from the registry directly.
+func magicItemRarityLabel(tier int) string {
+	switch tier {
+	case 1:
+		return "Common"
+	case 2:
+		return "Uncommon"
+	case 3:
+		return "Rare"
+	case 4:
+		return "Very Rare"
+	case 5:
+		return "Legendary"
+	}
+	return fmt.Sprintf("T%d", tier)
+}
+
 // ── Supplies (Consumables) ──────────────────────────────────────────────────
 
 func luigiSuppliesView(_ id.UserID, balance float64) string {
@@ -975,15 +1087,16 @@ func (p *AdventurePlugin) resolveShopSupplyChoice(ctx MessageContext, interactio
 		return p.SendDM(ctx.Sender, "I don't have that. Reply with an item name from the list, or `back` to return.")
 	}
 
+	consumablePrice := float64(match.Price) * p.shopSessionPriceFactor(ctx.Sender)
 	balance := p.euro.GetBalance(ctx.Sender)
-	if balance < float64(match.Price) {
+	if balance < consumablePrice {
 		p.pending.Store(string(ctx.Sender), interaction)
-		return p.SendDM(ctx.Sender, fmt.Sprintf("You need €%d for %s but only have €%.0f.", match.Price, match.Name, balance))
+		return p.SendDM(ctx.Sender, fmt.Sprintf("You need €%.0f for %s but only have €%.0f.", consumablePrice, match.Name, balance))
 	}
 
 	// Purchase the consumable
-	p.euro.Debit(ctx.Sender, float64(match.Price), "shop_consumable")
-	if potCut := int(math.Round(float64(match.Price) * 0.05)); potCut > 0 {
+	p.euro.Debit(ctx.Sender, consumablePrice, "shop_consumable")
+	if potCut := int(math.Round(consumablePrice * 0.05)); potCut > 0 {
 		communityPotAdd(potCut)
 		trackTaxPaid(ctx.Sender, potCut)
 	}
@@ -998,6 +1111,219 @@ func (p *AdventurePlugin) resolveShopSupplyChoice(ctx MessageContext, interactio
 	// Stay in supplies view for more purchases
 	p.pending.Store(string(ctx.Sender), interaction)
 	newBalance := p.euro.GetBalance(ctx.Sender)
-	return p.SendDM(ctx.Sender, fmt.Sprintf("Purchased **%s** for €%d. Added to inventory.\n💰 Balance: €%.0f\n\nReply with another item name or `back` to return.",
-		match.Name, match.Price, newBalance))
+	return p.SendDM(ctx.Sender, fmt.Sprintf("Purchased **%s** for €%.0f. Added to inventory.\n💰 Balance: €%.0f\n\nReply with another item name or `back` to return.",
+		match.Name, consumablePrice, newBalance))
+}
+
+// ── Curios (Magic Items) ────────────────────────────────────────────────────
+
+// curiosStockSize — how many registry magic items Luigi stocks per day.
+const curiosStockSize = 8
+
+// dailyCuriosStock returns the deterministic per-day rotation of magic items
+// on Luigi's Curios shelf. Seeded by UTC date so the slate is stable for the
+// day and identical for every player. 237 registry items is far too many to
+// list, so a rotating shelf keeps the menu legible and gives players a reason
+// to check back.
+//
+// The day flips at 06:00 UTC instead of midnight so EU-evening players see
+// "yesterday's stock" through the night and a fresh shelf with their morning
+// coffee, not at 1 a.m. mid-session.
+func dailyCuriosStock() []MagicItem {
+	ids := make([]string, 0, len(magicItemRegistry))
+	for id := range magicItemRegistry {
+		ids = append(ids, id)
+	}
+	sort.Strings(ids)
+
+	// FNV-1a over the offset-UTC date string → PCG seed.
+	day := time.Now().UTC().Add(-6 * time.Hour).Format("2006-01-02")
+	var seed uint64 = 1469598103934665603
+	for _, b := range []byte(day) {
+		seed ^= uint64(b)
+		seed *= 1099511628211
+	}
+	rng := rand.New(rand.NewPCG(seed, seed^0x9e3779b97f4a7c15))
+	rng.Shuffle(len(ids), func(i, j int) { ids[i], ids[j] = ids[j], ids[i] })
+
+	n := curiosStockSize
+	if n > len(ids) {
+		n = len(ids)
+	}
+	stock := make([]MagicItem, 0, n)
+	for _, id := range ids[:n] {
+		stock = append(stock, magicItemRegistry[id])
+	}
+	// Stable display order: rarity ascending, then name.
+	sort.Slice(stock, func(i, j int) bool {
+		ri, rj := rarityPowerScalar(stock[i].Rarity), rarityPowerScalar(stock[j].Rarity)
+		if ri != rj {
+			return ri < rj
+		}
+		return stock[i].Name < stock[j].Name
+	})
+	return stock
+}
+
+func (p *AdventurePlugin) luigiCuriosView(userID id.UserID, balance float64) string {
+	var sb strings.Builder
+	sb.WriteString("🔮 **Curios** — fresh stock daily at dawn\n")
+	sb.WriteString(fmt.Sprintf("💰 Balance: €%.0f\n\n", balance))
+
+	factor := p.shopSessionPriceFactor(userID)
+	for _, mi := range dailyCuriosStock() {
+		price := float64(mi.Value) * factor
+		// Pretty rarity ("Very Rare" not "very_rare"), drop the bare "wondrous"
+		// (the effect line already tells the player what it does), and call
+		// attunement what it actually means.
+		tag := magicItemRarityLabel(rarityLootTierNum(mi.Rarity))
+		if mi.Kind != MagicItemWondrous {
+			tag = string(prettyMagicItemKind(mi.Kind)) + " · " + tag
+		}
+		if mi.Attunement {
+			tag += " · needs bonding"
+		}
+		if mi.Kind == MagicItemPotion || mi.Kind == MagicItemScroll {
+			tag += " · auto-uses"
+		}
+		afford := "✅"
+		if balance < price {
+			afford = "💸"
+		}
+		sb.WriteString(fmt.Sprintf("**%s** _(%s)_ — €%.0f %s\n", mi.Name, tag, price, afford))
+		// The codified effect is what actually fires in combat; the SRD desc
+		// is flavour. Lead with the effect, then the flavour line.
+		if eff := magicItemEffectSummary(mi); eff != "" && eff != "no combat effect" {
+			sb.WriteString(fmt.Sprintf("  → %s\n", eff))
+		}
+		if mi.Desc != "" {
+			sb.WriteString(fmt.Sprintf("  _%s_\n", mi.Desc))
+		}
+	}
+
+	sb.WriteString("\nReply with an item name to buy, or `back` to return.\n")
+	sb.WriteString("_Bonding_ = at most 3 magic items can be \"on\" at once. Worn-but-unbonded curios are inert until you free a slot. Potions & scrolls fire automatically in combat.")
+	return sb.String()
+}
+
+// prettyMagicItemKind renders the registry's machine kind in a way a player
+// would actually use ("staff" not "MagicItemStaff", "scroll" not the raw
+// const).
+func prettyMagicItemKind(k MagicItemKind) string {
+	switch k {
+	case MagicItemWeapon:
+		return "weapon"
+	case MagicItemArmor:
+		return "armor"
+	case MagicItemRing:
+		return "ring"
+	case MagicItemWand:
+		return "wand"
+	case MagicItemRod:
+		return "rod"
+	case MagicItemStaff:
+		return "staff"
+	case MagicItemPotion:
+		return "potion"
+	case MagicItemScroll:
+		return "scroll"
+	}
+	return string(k)
+}
+
+func (p *AdventurePlugin) resolveShopCurioChoice(ctx MessageContext, interaction *advPendingInteraction) error {
+	reply := strings.TrimSpace(ctx.Body)
+	lower := strings.ToLower(reply)
+
+	if lower == "back" {
+		data := interaction.Data.(*advPendingShopCategory)
+		_, equip, err := p.ensureCharacter(ctx.Sender)
+		if err != nil {
+			return p.SendDM(ctx.Sender, "Failed to load your character.")
+		}
+		balance := p.euro.GetBalance(ctx.Sender)
+		text := luigiShopGreeting(ctx.Sender, equip, balance, data.ShowAll, p.chatLevel(ctx.Sender))
+		p.pending.Store(string(ctx.Sender), &advPendingInteraction{
+			Type:      "shop_category",
+			Data:      &advPendingShopCategory{ShowAll: data.ShowAll},
+			ExpiresAt: time.Now().Add(advDMResponseWindow),
+		})
+		return p.SendDM(ctx.Sender, text)
+	}
+	if lower == "exit" || lower == "cancel" {
+		p.shopSessionEnd(ctx.Sender)
+		return p.SendDM(ctx.Sender, "*Luigi nods and gestures toward the main counter.*")
+	}
+
+	// Match against today's stock. Exact (case-fold) name wins outright;
+	// otherwise we accumulate substring hits and require a unique candidate
+	// so "ring" doesn't silently sell whichever ring came first in the slate.
+	var (
+		match      *MagicItem
+		candidates []MagicItem
+	)
+	stock := dailyCuriosStock()
+	for _, mi := range stock {
+		if strings.EqualFold(mi.Name, reply) {
+			m := mi
+			match = &m
+			candidates = nil
+			break
+		}
+		if containsFold(mi.Name, reply) {
+			candidates = append(candidates, mi)
+		}
+	}
+	if match == nil {
+		switch len(candidates) {
+		case 0:
+			p.pending.Store(string(ctx.Sender), interaction)
+			return p.SendDM(ctx.Sender, "That's not on the shelf today. Reply with an item name from the list, or `back` to return.")
+		case 1:
+			m := candidates[0]
+			match = &m
+		default:
+			p.pending.Store(string(ctx.Sender), interaction)
+			var sb strings.Builder
+			sb.WriteString(fmt.Sprintf("Several curios match \"%s\":\n", reply))
+			for _, c := range candidates {
+				sb.WriteString(fmt.Sprintf("  • %s\n", c.Name))
+			}
+			sb.WriteString("Reply with the full name (or enough to be unique), or `back` to return.")
+			return p.SendDM(ctx.Sender, sb.String())
+		}
+	}
+
+	price := float64(match.Value) * p.shopSessionPriceFactor(ctx.Sender)
+	balance := p.euro.GetBalance(ctx.Sender)
+	if balance < price {
+		p.pending.Store(string(ctx.Sender), interaction)
+		return p.SendDM(ctx.Sender, fmt.Sprintf("You need €%.0f for %s but only have €%.0f.", price, match.Name, balance))
+	}
+
+	// Guard the Debit return: GetBalance above is a snapshot read, but
+	// the debt-limit check inside Debit (BLACKJACK_DEBT_LIMIT) can refuse
+	// the write if a concurrent debit (blackjack, lottery, etc.) has
+	// slipped the balance across the limit between read and write.
+	// Without this guard the curio would be granted on a refused debit.
+	if !p.euro.Debit(ctx.Sender, price, "shop_curio") {
+		p.pending.Store(string(ctx.Sender), interaction)
+		return p.SendDM(ctx.Sender, fmt.Sprintf(
+			"Tried to charge €%.0f for %s, but the purse refused — your balance moved out from under us. Try again.",
+			price, match.Name))
+	}
+	if potCut := int(math.Round(price * 0.05)); potCut > 0 {
+		communityPotAdd(potCut)
+		trackTaxPaid(ctx.Sender, potCut)
+	}
+	item := magicItemSell(*match)
+	item.Value = int64(match.Value) / 2 // resale at half, like gear/consumables
+	item.SkillSource = "magic_item:" + match.ID
+	_ = addAdvInventoryItem(ctx.Sender, item)
+
+	// Stay in the Curios view for more purchases.
+	p.pending.Store(string(ctx.Sender), interaction)
+	newBalance := p.euro.GetBalance(ctx.Sender)
+	return p.SendDM(ctx.Sender, fmt.Sprintf("Purchased **%s** for €%.0f. Added to inventory.\n💰 Balance: €%.0f\n\nReply with another item name or `back` to return.",
+		match.Name, price, newBalance))
 }

internal/plugin/adventure_shop_sell_test.go

@@ -0,0 +1,119 @@
+package plugin
+
+import (
+	"strings"
+	"testing"
+
+	"gogobee/internal/db"
+	"maunium.net/go/mautrix/id"
+)
+
+// freshShopTestDB spins up an empty DB in a tempdir for the sell-path tests.
+// Distinct from setupAuditTestDB, which clones the prod snapshot.
+func freshShopTestDB(t *testing.T) {
+	t.Helper()
+	dir := t.TempDir()
+	db.Close()
+	if err := db.Init(dir); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(db.Close)
+}
+
+// TestSellAll_PreservesMagicItems — B1 (data-loss blocker): `sell all` must
+// route around curios (Type=="magic_item") so a careless liquidation can't
+// silently delete a Legendary Ring. Junk in the same bag still sells.
+func TestSellAll_PreservesMagicItems(t *testing.T) {
+	freshShopTestDB(t)
+	uid := id.UserID("@sellall_magic:test")
+
+	curio := AdvItem{Name: "Ring of Protection", Type: "magic_item", Tier: 3, Value: 500}
+	junk := AdvItem{Name: "Iron Ore", Type: "material", Tier: 1, Value: 40}
+	if err := addAdvInventoryItem(uid, curio); err != nil {
+		t.Fatal(err)
+	}
+	if err := addAdvInventoryItem(uid, junk); err != nil {
+		t.Fatal(err)
+	}
+
+	euro := &EuroPlugin{}
+	euro.ensureBalance(uid)
+	p := &AdventurePlugin{euro: euro}
+
+	msg := p.advSellAll(uid)
+	if !strings.Contains(msg, "Sold 1 item") {
+		t.Errorf("expected exactly one item sold, msg=%q", msg)
+	}
+	if !strings.Contains(strings.ToLower(msg), "curio") {
+		t.Errorf("sell-all summary should call out kept curios, msg=%q", msg)
+	}
+
+	left, err := loadAdvInventory(uid)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(left) != 1 || left[0].Type != "magic_item" {
+		t.Fatalf("magic item not preserved: %+v", left)
+	}
+
+	// Payout reflects only the junk's €40 (5% pot cut → ~€38 credited).
+	bal := euro.GetBalance(uid)
+	if bal <= 0 || bal > 40 {
+		t.Errorf("payout %v outside expected (0,40] for €40 junk", bal)
+	}
+}
+
+// TestSellAll_OnlyMagicItems — when the bag is curios only, sell-all reroutes
+// to !adventure equip-magic and touches nothing.
+func TestSellAll_OnlyMagicItems(t *testing.T) {
+	freshShopTestDB(t)
+	uid := id.UserID("@sellall_only_magic:test")
+
+	if err := addAdvInventoryItem(uid, AdvItem{Name: "Cloak of Elvenkind", Type: "magic_item", Value: 300}); err != nil {
+		t.Fatal(err)
+	}
+
+	euro := &EuroPlugin{}
+	euro.ensureBalance(uid)
+	p := &AdventurePlugin{euro: euro}
+
+	msg := p.advSellAll(uid)
+	if !strings.Contains(msg, "equip-magic") {
+		t.Errorf("expected reroute to equip-magic, msg=%q", msg)
+	}
+	if euro.GetBalance(uid) != 0 {
+		t.Errorf("balance moved on curio-only sell-all: %v", euro.GetBalance(uid))
+	}
+	left, _ := loadAdvInventory(uid)
+	if len(left) != 1 {
+		t.Errorf("curio deleted by sell-all: %+v", left)
+	}
+}
+
+// TestSellItem_MagicItemRerouted — explicit `sell <curio name>` must refuse
+// and point the player at the bonding command.
+func TestSellItem_MagicItemRerouted(t *testing.T) {
+	freshShopTestDB(t)
+	uid := id.UserID("@sellone_magic:test")
+
+	curio := AdvItem{Name: "Amulet of Health", Type: "magic_item", Value: 750}
+	if err := addAdvInventoryItem(uid, curio); err != nil {
+		t.Fatal(err)
+	}
+
+	euro := &EuroPlugin{}
+	euro.ensureBalance(uid)
+	p := &AdventurePlugin{euro: euro}
+
+	msg := p.advSellItem(uid, "amulet")
+	if !strings.Contains(msg, "equip-magic") {
+		t.Errorf("expected reroute to equip-magic, msg=%q", msg)
+	}
+	if euro.GetBalance(uid) != 0 {
+		t.Errorf("balance moved on refused curio sale: %v", euro.GetBalance(uid))
+	}
+	left, _ := loadAdvInventory(uid)
+	if len(left) != 1 {
+		t.Errorf("curio deleted by refused sale: %+v", left)
+	}
+}

internal/plugin/adventure_treasure.go

@@ -2,6 +2,7 @@ package plugin
 
 import (
 	"math/rand/v2"
+	"strings"
 
 	"gogobee/internal/db"
 	"maunium.net/go/mautrix/id"
@@ -241,20 +242,25 @@ var advAllTreasures = map[int][]AdvTreasureDef{
 
 // ── Treasure Drop Logic ──────────────────────────────────────────────────────
 
-func rollAdvTreasureDrop(tier int, userID id.UserID, chatLevel int) *AdvTreasureDrop {
-	rate, ok := advTreasureDropRates[tier]
+// rollAdvTreasureDropDetailed returns the drop (or nil) plus the random roll
+// and the effective drop rate, so callers can surface near-miss feedback
+// ("rolled 1.8% vs 1.5% chance — just missed"). Players never see treasure
+// math otherwise, which makes rare drops feel mythical.
+func rollAdvTreasureDropDetailed(tier int, userID id.UserID, chatLevel int) (drop *AdvTreasureDrop, roll, rate float64) {
+	r, ok := advTreasureDropRates[tier]
 	if !ok {
-		return nil
+		return nil, 0, 0
 	}
-	rate += chatLevelRareBonus(chatLevel)
+	rate = r + chatLevelRareBonus(chatLevel)
+	roll = rand.Float64()
 
-	if rand.Float64() >= rate {
-		return nil
+	if roll >= rate {
+		return nil, roll, rate
 	}
 
 	pool, ok := advAllTreasures[tier]
 	if !ok || len(pool) == 0 {
-		return nil
+		return nil, roll, rate
 	}
 
 	// Pick random treasure
@@ -267,11 +273,68 @@ func rollAdvTreasureDrop(tier int, userID id.UserID, chatLevel int) *AdvTreasure
 		def = &pool[rand.IntN(len(pool))]
 		owns, err = advUserOwnsTreasure(userID, def.Key)
 		if err != nil || owns {
-			return nil // both rolls duplicated
+			return nil, roll, rate // both rolls duplicated
 		}
 	}
 
-	return &AdvTreasureDrop{Def: def}
+	return &AdvTreasureDrop{Def: def}, roll, rate
+}
+
+// rollAdvTreasureDrop is the legacy single-return variant used by call sites
+// that don't surface near-miss feedback (auto-babysit, twinbee shares).
+func rollAdvTreasureDrop(tier int, userID id.UserID, chatLevel int) *AdvTreasureDrop {
+	d, _, _ := rollAdvTreasureDropDetailed(tier, userID, chatLevel)
+	return d
+}
+
+// ── Treasure Comparison ─────────────────────────────────────────────────────
+
+// advTreasureIrreplaceable reports whether a treasure carries a bonus type
+// that can't be replicated by another drop (e.g. monthly death bypass).
+// Such treasures are excluded from auto-swap and fall back to the manual
+// discard prompt so the player consciously chooses to give one up.
+func advTreasureIrreplaceable(def *AdvTreasureDef) bool {
+	if def == nil {
+		return false
+	}
+	for _, b := range def.Bonuses {
+		if strings.HasPrefix(b.Type, "special_") {
+			return true
+		}
+	}
+	return false
+}
+
+// advTreasureRank produces a comparable triple (tier, bonusCount, key) for
+// auto-swap decisions. Bonuses are heterogeneous and there's no honest
+// scalar comparator — we use tier first, then bonus count as a tiebreaker,
+// then the deterministic key so equal-rank ties prefer the existing item
+// (no churn). Higher tuple = better treasure.
+type advTreasureRankKey struct {
+	Tier       int
+	BonusCount int
+	Key        string
+}
+
+func advTreasureRank(def *AdvTreasureDef) advTreasureRankKey {
+	if def == nil {
+		return advTreasureRankKey{}
+	}
+	return advTreasureRankKey{Tier: def.Tier, BonusCount: len(def.Bonuses), Key: def.Key}
+}
+
+// advTreasureRankBetter reports whether a is strictly better than b.
+// Equal-rank returns false (caller treats this as "keep existing").
+func advTreasureRankBetter(a, b advTreasureRankKey) bool {
+	if a.Tier != b.Tier {
+		return a.Tier > b.Tier
+	}
+	if a.BonusCount != b.BonusCount {
+		return a.BonusCount > b.BonusCount
+	}
+	// Deterministic but neutral tiebreak — different keys aren't "better"
+	// than each other, so equal Tier+BonusCount means no swap.
+	return false
 }
 
 // ── Treasure DB Operations ───────────────────────────────────────────────────

internal/plugin/adventure_twinbee.go

@@ -4,30 +4,13 @@ import (
 	"fmt"
 	"log/slog"
 	"math/rand/v2"
+	"strings"
 	"time"
 
 	"gogobee/internal/db"
 	"maunium.net/go/mautrix/id"
 )
 
-// ── TwinBee Character (fixed stats) ──────────────────────────────────────────
-
-var twinBeeChar = AdventureCharacter{
-	DisplayName: "TwinBee 🐝",
-	CombatLevel: 35,
-	MiningSkill: 28,
-	ForagingSkill: 22,
-	Alive:       true,
-}
-
-var twinBeeEquip = map[EquipmentSlot]*AdvEquipment{
-	SlotWeapon: {Slot: SlotWeapon, Tier: 4, Condition: 100, Name: "The Spread Gun"},
-	SlotArmor:  {Slot: SlotArmor, Tier: 4, Condition: 100, Name: "Enchanted Plate"},
-	SlotHelmet: {Slot: SlotHelmet, Tier: 4, Condition: 100, Name: "Guardian's Helm"},
-	SlotBoots:  {Slot: SlotBoots, Tier: 4, Condition: 100, Name: "Ranger's Boots"},
-	SlotTool:   {Slot: SlotTool, Tier: 4, Condition: 100, Name: "Mithril Pickaxe"},
-}
-
 // ── TwinBee Action Selection ─────────────────────────────────────────────────
 
 type twinBeeActionWeight struct {
@@ -45,7 +28,8 @@ var twinBeeWeights = []twinBeeActionWeight{
 }
 
 // twinBeeMaxTier returns the highest tier TwinBee should visit,
-// based on the best player's combined adventure level.
+// based on the best player's combined adventure level. Combat component
+// reads from D&D level (post-L4f) instead of legacy combat level.
 func twinBeeMaxTier() int {
 	chars, err := loadAllAdvCharacters()
 	if err != nil || len(chars) == 0 {
@@ -56,7 +40,7 @@ func twinBeeMaxTier() int {
 		if !c.Alive {
 			continue
 		}
-		combined := c.CombatLevel + c.MiningSkill + c.ForagingSkill + c.FishingSkill
+		combined := dndLevelForUser(c.UserID) + c.MiningSkill + c.ForagingSkill + c.FishingSkill
 		if combined > bestLevel {
 			bestLevel = combined
 		}
@@ -117,6 +101,65 @@ type TwinBeeResult struct {
 	FlavorText string
 }
 
+// simulateTwinBeeOutcome rolls a flat outcome distribution for TwinBee's
+// off-screen daily run. TwinBee never dies — death rolls become empty.
+// Distribution by tier roughly matches the legacy simulator's spread:
+// tier 3 → 60% success / 25% exceptional / 15% empty; tier 4 → 55/20/25;
+// tier 5 → 50/15/35 (deeper places are stingier even for TwinBee).
+func simulateTwinBeeOutcome(tier int) AdvOutcomeType {
+	roll := rand.IntN(100)
+	var emptyPct, successPct int
+	switch tier {
+	case 5:
+		emptyPct, successPct = 35, 50
+	case 4:
+		emptyPct, successPct = 25, 55
+	default:
+		emptyPct, successPct = 15, 60
+	}
+	switch {
+	case roll < emptyPct:
+		return AdvOutcomeEmpty
+	case roll < emptyPct+successPct:
+		return AdvOutcomeSuccess
+	default:
+		return AdvOutcomeExceptional
+	}
+}
+
+// simulateTwinBeeLoot returns gold value + 1–3 themed item names for the
+// rolled outcome. Empty → zero/no items. Exceptional ≈ 2.2× success base.
+func simulateTwinBeeLoot(loc *AdvLocation, outcome AdvOutcomeType) (int64, []string) {
+	if outcome == AdvOutcomeEmpty || loc == nil {
+		return 0, nil
+	}
+	tier := loc.Tier
+	if tier < 1 {
+		tier = 1
+	}
+	// Base loot scales as tier^2 * 75 with ±25% jitter.
+	base := int64(tier*tier*75) + int64(rand.IntN(tier*tier*40))
+	if outcome == AdvOutcomeExceptional {
+		base = base * 22 / 10
+	}
+	// Item names borrow from the location's denizens string for flavor; no
+	// inventory is actually deposited for TwinBee — these are display only.
+	names := strings.Split(loc.Denizens, ", ")
+	picks := 1 + rand.IntN(2)
+	if outcome == AdvOutcomeExceptional {
+		picks = 2 + rand.IntN(2)
+	}
+	if picks > len(names) {
+		picks = len(names)
+	}
+	chosen := make([]string, 0, picks)
+	rand.Shuffle(len(names), func(i, j int) { names[i], names[j] = names[j], names[i] })
+	for i := 0; i < picks && i < len(names); i++ {
+		chosen = append(chosen, strings.TrimSpace(names[i]))
+	}
+	return base, chosen
+}
+
 func (p *AdventurePlugin) runTwinBeeDaily() *TwinBeeResult {
 	activity, loc := selectTwinBeeAction()
 	if loc == nil {
@@ -124,46 +167,19 @@ func (p *AdventurePlugin) runTwinBeeDaily() *TwinBeeResult {
 		return nil
 	}
 
-	// Copy equipment so mutations don't accumulate on the global template.
-	equip := make(map[EquipmentSlot]*AdvEquipment, len(twinBeeEquip))
-	for k, v := range twinBeeEquip {
-		copy := *v
-		equip[k] = &copy
-	}
+	outcome := simulateTwinBeeOutcome(loc.Tier)
+	value, items := simulateTwinBeeLoot(loc, outcome)
 
-	bonuses := &AdvBonusSummary{} // TwinBee has no treasures/buffs
-	result := resolveAdvAction(&twinBeeChar, equip, loc, bonuses, false)
-
-	// TwinBee never dies — reroll death to empty
-	if result.Outcome == AdvOutcomeDeath {
-		result.Outcome = AdvOutcomeEmpty
-		result.LootItems = nil
-		result.TotalLootValue = 0
-		result.EquipDamage = nil
-		result.EquipBroken = nil
-	}
-
-	// No treasure drops for TwinBee
-	result.TreasureFound = nil
-
-	// Select TwinBee-specific flavor text
 	tbResult := &TwinBeeResult{
 		Activity:  activity,
 		Location:  loc,
-		Outcome:   result.Outcome,
-		LootValue: result.TotalLootValue,
+		Outcome:   outcome,
+		LootValue: value,
+	}
+	if len(items) > 0 {
+		tbResult.LootDesc = joinAdvItems(items)
 	}
 
-	// Build loot description
-	if len(result.LootItems) > 0 {
-		names := make([]string, len(result.LootItems))
-		for i, item := range result.LootItems {
-			names[i] = item.Name
-		}
-		tbResult.LootDesc = joinAdvItems(names)
-	}
-
-	// Select flavor
 	tbResult.FlavorText = p.selectTwinBeeFlavor(tbResult)
 
 	return tbResult
@@ -186,7 +202,7 @@ func (p *AdventurePlugin) selectTwinBeeFlavor(result *TwinBeeResult) string {
 	}
 
 	if len(pool) == 0 {
-		return "TwinBee went to " + result.Location.Name + ". Results pending."
+		return "I went to " + result.Location.Name + ". Results pending."
 	}
 
 	text := pool[rand.IntN(len(pool))]
@@ -267,7 +283,7 @@ func (p *AdventurePlugin) distributeTwinBeeRewards(result *TwinBeeResult) TwinBe
 		weight := 4 // minimum (level 1 in all 4 skills)
 		for _, c := range chars {
 			if c.UserID == uid {
-				weight = c.CombatLevel + c.MiningSkill + c.ForagingSkill + c.FishingSkill
+				weight = dndLevelForUser(c.UserID) + c.MiningSkill + c.ForagingSkill + c.FishingSkill
 				if weight < 4 {
 					weight = 4
 				}
@@ -314,13 +330,13 @@ type twinBeeGiftDef struct {
 }
 
 var twinBeeGifts = []twinBeeGiftDef{
-	{"success_chance", "TwinBee's Lucky Star ⭐", 10, 24 * time.Hour, "TwinBee sends a star. They have many stars. Use it well."},
+	{"success_chance", "TwinBee's Lucky Star ⭐", 10, 24 * time.Hour, "I send a star. They have many stars. Use it well."},
 	{"death_chance", "Bec's Blessing 🐝", -5, 48 * time.Hour, "Bec has blessed you. Bec does not do this lightly. Don't die."},
 	{"loot_quality", "WinBee's Coin 🪙", 15, 24 * time.Hour, "WinBee flipped this coin and it came up you. Lucky."},
 	{"mining_success", "Goemon's Pipe 🎋", 8, 48 * time.Hour, "Borrowed from Goemon. Return not expected. Results expected."},
 	{"foraging_death", "Pentarou's Feather 🪶", -10, 24 * time.Hour, "Pentarou parted with this reluctantly. They like you enough. Mostly."},
 	{"xp_multiplier", "TwinBee's Bell Fragment 🔔", 5, 48 * time.Hour, "A piece of the Bell. It rings when you're doing well. It will ring."},
-	{"exceptional_chance", "Power Up Pod 🫛", 50, 48 * time.Hour, "TwinBee found extras. This is not a common occurrence. Don't waste it."},
+	{"exceptional_chance", "Power Up Pod 🫛", 50, 48 * time.Hour, "I found extras. This is not a common occurrence. Don't waste it."},
 }
 
 const twinBeeGiftChance = 0.15

internal/plugin/audit_fixes_test.go

@@ -141,7 +141,7 @@ func TestIndexDDL_ContainsNewIndexes(t *testing.T) {
 		Earnings:     500,
 		TierEarnings: 100,
 	}
-	status := renderArenaStatus(run, &AdventureCharacter{})
+	status := renderArenaStatus(run)
 	if !strings.Contains(status, "Tier: 2") {
 		t.Error("renderArenaStatus should show tier")
 	}
@@ -151,7 +151,7 @@ func TestIndexDDL_ContainsNewIndexes(t *testing.T) {
 
 	// Awaiting state
 	run.Status = "awaiting"
-	status = renderArenaStatus(run, &AdventureCharacter{})
+	status = renderArenaStatus(run)
 	if !strings.Contains(status, "bail") {
 		t.Error("renderArenaStatus should show bail command for awaiting runs")
 	}
@@ -225,7 +225,7 @@ func TestRenderArenaStatus_NoInternalLeak(t *testing.T) {
 		Earnings:     0,
 		TierEarnings: 50,
 	}
-	msg := renderArenaStatus(run, &AdventureCharacter{})
+	msg := renderArenaStatus(run)
 
 	for _, bad := range []string{"panic", "goroutine", "runtime.", "err="} {
 		if strings.Contains(msg, bad) {

internal/plugin/bestiary_srd.go

@@ -0,0 +1,191 @@
+package plugin
+
+// SRD-shaped stat blocks for the turn-based elite/boss engine.
+//
+// The auto-resolve path (SimulateCombat) keeps the simplified one-attack
+// DnDMonsterTemplate shape — its Attack value is a gameplay-tuned average that
+// bakes a creature's whole action into a single number, and the 2026-05-10
+// rebalance is calibrated against it. Do NOT feed these profiles into
+// auto-resolve.
+//
+// The turn-based path can afford canonical SRD multiattack *structure*: the
+// player issues a command per round, so a creature making three attack rolls a
+// turn is a tactical problem the player can answer (heal, control, flee) rather
+// than an un-survivable spike.
+//
+// Balance basis (2026-05-14 tuning pass): raw SRD damage is calibrated for a
+// 4-PC party and one-shots gogobee's single player — slice 1 shipped it
+// canonical and it was un-survivable across every tier (marilith ~91/round,
+// even Grol ~20/round vs a level-1 mage). So each profile keeps its SRD
+// *shape* — attack count, names, per-attack to-hit, and the damage split
+// between attacks — but the per-attack Damage values are scaled so the
+// profile's round total lands at roughly 1.3x the creature's tuned
+// auto-resolve Attack stat (dndBestiary). That 1.3x is deliberate: the
+// 2026-05-10 rebalance calibrated the single-attack Attack stat as the
+// gameplay floor, and turn-based fights should hit a little harder than
+// auto-resolve to make the player's per-round agency (heal / control / flee)
+// matter — but multiattack already raises hit reliability vs high-AC builds,
+// and monster abilities now fire as riders on top, so the headroom over
+// auto-resolve stays modest. Damage flows through the same calcDamage penalty
+// formula as the Attack stat, so the two are directly comparable in scale.
+//
+// File is intentionally NOT dnd_-prefixed (see memory: no new dnd_* identifiers).
+
+// SRDAttack is one attack roll within a creature's multiattack action: a d20
+// to-hit and an average damage value for that single strike.
+type SRDAttack struct {
+	Name        string // "Longsword", "Bite", "Claw" — surfaces in the round log
+	AttackBonus int    // d20 to-hit modifier; 0 falls back to the template AttackBonus
+	Damage      int    // average damage for this single attack
+}
+
+// SRDProfile is a creature's full multiattack action — one SRDAttack per attack
+// roll it makes on its turn. A creature with no profile registered makes a
+// single attack using its DnDMonsterTemplate Attack / AttackBonus.
+type SRDProfile struct {
+	Attacks []SRDAttack
+}
+
+// srdProfiles is the turn-based multiattack registry, keyed by bestiary ID.
+// Only elites and bosses that reach the turn-based engine need an entry; every
+// other creature falls through to the single-attack template path. Per-attack
+// Damage is tuned (not raw SRD) — see the balance-basis note above; the
+// // -comment after each profile records the tuned auto-resolve Attack stat the
+// total was scaled against.
+var srdProfiles = map[string]SRDProfile{
+	// ── Bosses ───────────────────────────────────────────────────────────
+	"boss_grol_unbroken": {Attacks: []SRDAttack{ // Attack 6 → ~8
+		{Name: "Morningstar", AttackBonus: 5, Damage: 5},
+		{Name: "Javelin", AttackBonus: 5, Damage: 3},
+	}},
+	"boss_valdris_unburied": {Attacks: []SRDAttack{ // Attack 8 → ~10
+		{Name: "Paralyzing Touch", AttackBonus: 7, Damage: 6},
+		{Name: "Necrotic Bolt", AttackBonus: 7, Damage: 4},
+	}},
+	"boss_hollow_king": {Attacks: []SRDAttack{ // Attack 10 → ~13
+		{Name: "Root Slam", AttackBonus: 7, Damage: 7},
+		{Name: "Root Slam", AttackBonus: 7, Damage: 6},
+	}},
+	"boss_dreaming_aboleth": {Attacks: []SRDAttack{ // Attack 16 → ~21
+		{Name: "Tentacle", AttackBonus: 9, Damage: 7},
+		{Name: "Tentacle", AttackBonus: 9, Damage: 7},
+		{Name: "Tentacle", AttackBonus: 9, Damage: 7},
+	}},
+	"boss_aldric_blackspire": {Attacks: []SRDAttack{ // Attack 21 → ~27
+		{Name: "Unarmed Strike", AttackBonus: 9, Damage: 14},
+		{Name: "Bite", AttackBonus: 9, Damage: 13},
+	}},
+	"boss_emberlord_thyrak": {Attacks: []SRDAttack{ // Attack 14 → ~18
+		{Name: "Molten Maul", AttackBonus: 8, Damage: 9},
+		{Name: "Molten Maul", AttackBonus: 8, Damage: 9},
+	}},
+	"boss_ilvaras_xunyl": {Attacks: []SRDAttack{ // Attack 19 → ~25
+		{Name: "Scourge", AttackBonus: 9, Damage: 13},
+		{Name: "Scourge", AttackBonus: 9, Damage: 12},
+	}},
+	"boss_thornmother": {Attacks: []SRDAttack{ // Attack 18 → ~23
+		{Name: "Thorned Lash", AttackBonus: 8, Damage: 12},
+		{Name: "Thorned Lash", AttackBonus: 8, Damage: 11},
+	}},
+	"boss_infernax": {Attacks: []SRDAttack{ // Attack 38 → ~49
+		{Name: "Bite", AttackBonus: 11, Damage: 19},
+		{Name: "Claw", AttackBonus: 11, Damage: 15},
+		{Name: "Claw", AttackBonus: 11, Damage: 15},
+	}},
+	"boss_belaxath": {Attacks: []SRDAttack{ // Attack 31 → ~40
+		{Name: "Longsword", AttackBonus: 11, Damage: 24},
+		{Name: "Whip", AttackBonus: 11, Damage: 16},
+	}},
+
+	// ── Multiattack elites ───────────────────────────────────────────────
+	"hobgoblin_warchief": {Attacks: []SRDAttack{ // Attack 4 → ~5
+		{Name: "Longsword", AttackBonus: 5, Damage: 3},
+		{Name: "Longsword", AttackBonus: 5, Damage: 2},
+	}},
+	"bandit_captain": {Attacks: []SRDAttack{ // Attack 4 → ~6
+		{Name: "Scimitar", AttackBonus: 5, Damage: 2},
+		{Name: "Scimitar", AttackBonus: 5, Damage: 2},
+		{Name: "Dagger", AttackBonus: 5, Damage: 2},
+	}},
+	"owlbear": {Attacks: []SRDAttack{ // Attack 6 → ~8
+		{Name: "Beak", AttackBonus: 7, Damage: 3},
+		{Name: "Claws", AttackBonus: 7, Damage: 5},
+	}},
+	"merrow": {Attacks: []SRDAttack{ // Attack 4 → ~5
+		{Name: "Bite", AttackBonus: 5, Damage: 3},
+		{Name: "Claws", AttackBonus: 5, Damage: 2},
+	}},
+	"helmed_horror": {Attacks: []SRDAttack{ // Attack 7 → ~9
+		{Name: "Longsword", AttackBonus: 6, Damage: 5},
+		{Name: "Longsword", AttackBonus: 6, Damage: 4},
+	}},
+	"drow_elite_warrior": {Attacks: []SRDAttack{ // Attack 8 → ~10
+		{Name: "Shortsword", AttackBonus: 7, Damage: 4},
+		{Name: "Shortsword", AttackBonus: 7, Damage: 3},
+		{Name: "Hand Crossbow", AttackBonus: 7, Damage: 3},
+	}},
+	"salamander": {Attacks: []SRDAttack{ // Attack 8 → ~10
+		{Name: "Spear", AttackBonus: 7, Damage: 5},
+		{Name: "Tail", AttackBonus: 7, Damage: 5},
+	}},
+	"guard_drake": {Attacks: []SRDAttack{ // Attack 4 → ~5
+		{Name: "Bite", AttackBonus: 5, Damage: 3},
+		{Name: "Claws", AttackBonus: 5, Damage: 2},
+	}},
+	"young_red_dragon": {Attacks: []SRDAttack{ // Attack 16 → ~20
+		{Name: "Bite", AttackBonus: 10, Damage: 8},
+		{Name: "Claw", AttackBonus: 10, Damage: 6},
+		{Name: "Claw", AttackBonus: 10, Damage: 6},
+	}},
+	"quickling": {Attacks: []SRDAttack{ // Attack 2 → ~3
+		{Name: "Dagger", AttackBonus: 5, Damage: 1},
+		{Name: "Dagger", AttackBonus: 5, Damage: 1},
+		{Name: "Dagger", AttackBonus: 5, Damage: 1},
+	}},
+	"vrock": {Attacks: []SRDAttack{ // Attack 10 → ~13
+		{Name: "Beak", AttackBonus: 6, Damage: 5},
+		{Name: "Talons", AttackBonus: 6, Damage: 8},
+	}},
+	"hezrou": {Attacks: []SRDAttack{ // Attack 13 → ~17
+		{Name: "Bite", AttackBonus: 7, Damage: 7},
+		{Name: "Claw", AttackBonus: 7, Damage: 5},
+		{Name: "Claw", AttackBonus: 7, Damage: 5},
+	}},
+	"nalfeshnee": {Attacks: []SRDAttack{ // Attack 21 → ~28
+		{Name: "Bite", AttackBonus: 10, Damage: 14},
+		{Name: "Claw", AttackBonus: 10, Damage: 7},
+		{Name: "Claw", AttackBonus: 10, Damage: 7},
+	}},
+	"marilith": {Attacks: []SRDAttack{ // Attack 26 → ~34
+		{Name: "Longsword", AttackBonus: 11, Damage: 5},
+		{Name: "Longsword", AttackBonus: 11, Damage: 5},
+		{Name: "Longsword", AttackBonus: 11, Damage: 5},
+		{Name: "Longsword", AttackBonus: 11, Damage: 5},
+		{Name: "Longsword", AttackBonus: 11, Damage: 5},
+		{Name: "Longsword", AttackBonus: 11, Damage: 5},
+		{Name: "Tail", AttackBonus: 11, Damage: 4},
+	}},
+	"vampire_spawn": {Attacks: []SRDAttack{ // Attack 8 → ~10
+		{Name: "Unarmed Strike", AttackBonus: 6, Damage: 6},
+		{Name: "Bite", AttackBonus: 6, Damage: 4},
+	}},
+}
+
+// enemyAttackProfile returns the attack rolls a creature makes on its turn.
+// Registered elites/bosses use their SRD multiattack profile; everyone else
+// falls back to a single attack derived from the template stats. A zero
+// per-attack AttackBonus falls back to the (tier-scaled) template bonus.
+func enemyAttackProfile(enemyID string, stats CombatStats) []SRDAttack {
+	prof, ok := srdProfiles[enemyID]
+	if !ok || len(prof.Attacks) == 0 {
+		return []SRDAttack{{AttackBonus: stats.AttackBonus, Damage: stats.Attack}}
+	}
+	out := make([]SRDAttack, len(prof.Attacks))
+	for i, a := range prof.Attacks {
+		if a.AttackBonus == 0 {
+			a.AttackBonus = stats.AttackBonus
+		}
+		out[i] = a
+	}
+	return out
+}

internal/plugin/bestiary_srd_data.go

@@ -0,0 +1,339 @@
+// Code generated by cmd/open5e-import. DO NOT EDIT.
+//
+// Source: Open5e SRD monster dump (data/open5e/monsters.json), 5e SRD content
+// under CC-BY-4.0 — see NOTICE. Regenerate with:
+//
+//	go run ./cmd/open5e-import fetch bestiary
+//	go run ./cmd/open5e-import gen bestiary
+//
+// This is the RAW SRD staging table — see bestiary_srd_staging.go for why these
+// values are a balance baseline and not a drop-in engine roster.
+
+package plugin
+
+func buildSRDStagingBestiary() map[string]SRDStatBlock {
+	return map[string]SRDStatBlock{
+		"awakened_shrub":            {Slug: "awakened_shrub", Name: "Awakened Shrub", Size: "small", Type: "plant", CR: 0, XP: 10, HP: 10, AC: 9, SpeedWalk: 20, STR: 3, DEX: 8, CON: 11, INT: 10, WIS: 10, CHA: 6, Attacks: []SRDStatAttack{{Name: "Rake", AttackBonus: 1, DamageDice: "1d4", DamageBonus: -1, AvgDamage: 1, DamageType: "slashing"}}, Traits: []string{"False Appearance"}},
+		"baboon":                    {Slug: "baboon", Name: "Baboon", Size: "small", Type: "beast", CR: 0, XP: 10, HP: 3, AC: 12, SpeedWalk: 30, STR: 8, DEX: 14, CON: 11, INT: 4, WIS: 12, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 1, DamageDice: "1d4", DamageBonus: -1, AvgDamage: 1, DamageType: "piercing"}}, Traits: []string{"Pack Tactics"}},
+		"badger":                    {Slug: "badger", Name: "Badger", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 3, AC: 10, SpeedWalk: 20, STR: 4, DEX: 11, CON: 12, INT: 2, WIS: 12, CHA: 5, Traits: []string{"Keen Smell"}},
+		"bat":                       {Slug: "bat", Name: "Bat", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 12, SpeedWalk: 5, STR: 2, DEX: 15, CON: 8, INT: 2, WIS: 12, CHA: 4, Traits: []string{"Echolocation", "Keen Hearing"}},
+		"cat":                       {Slug: "cat", Name: "Cat", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 2, AC: 12, SpeedWalk: 40, STR: 3, DEX: 15, CON: 10, INT: 3, WIS: 12, CHA: 7, Traits: []string{"Keen Smell"}},
+		"commoner":                  {Slug: "commoner", Name: "Commoner", Size: "medium", Type: "humanoid", CR: 0, XP: 10, HP: 4, AC: 10, SpeedWalk: 30, STR: 10, DEX: 10, CON: 10, INT: 10, WIS: 10, CHA: 10, Attacks: []SRDStatAttack{{Name: "Club", AttackBonus: 2, DamageDice: "1d4", DamageBonus: 0, AvgDamage: 2, DamageType: "bludgeoning"}}},
+		"crab":                      {Slug: "crab", Name: "Crab", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 2, AC: 11, SpeedWalk: 20, STR: 2, DEX: 11, CON: 10, INT: 1, WIS: 8, CHA: 2, Traits: []string{"Amphibious"}},
+		"deer":                      {Slug: "deer", Name: "Deer", Size: "medium", Type: "beast", CR: 0, XP: 10, HP: 4, AC: 13, SpeedWalk: 50, STR: 11, DEX: 16, CON: 11, INT: 2, WIS: 14, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 2, DamageDice: "1d4", DamageBonus: 0, AvgDamage: 2, DamageType: "piercing"}}},
+		"eagle":                     {Slug: "eagle", Name: "Eagle", Size: "small", Type: "beast", CR: 0, XP: 10, HP: 3, AC: 12, SpeedWalk: 10, STR: 6, DEX: 15, CON: 10, INT: 2, WIS: 14, CHA: 7, Attacks: []SRDStatAttack{{Name: "Talons", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "slashing"}}, Traits: []string{"Keen Sight"}},
+		"frog":                      {Slug: "frog", Name: "Frog", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 11, SpeedWalk: 20, STR: 1, DEX: 13, CON: 8, INT: 1, WIS: 8, CHA: 3, Traits: []string{"Amphibious", "Standing Leap"}},
+		"giant_fire_beetle":         {Slug: "giant_fire_beetle", Name: "Giant Fire Beetle", Size: "small", Type: "beast", CR: 0, XP: 10, HP: 4, AC: 13, SpeedWalk: 30, STR: 8, DEX: 10, CON: 12, INT: 1, WIS: 7, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 1, DamageDice: "1d6", DamageBonus: -1, AvgDamage: 2, DamageType: "slashing"}}, Traits: []string{"Illumination"}},
+		"goat":                      {Slug: "goat", Name: "Goat", Size: "medium", Type: "beast", CR: 0, XP: 10, HP: 4, AC: 10, SpeedWalk: 40, STR: 12, DEX: 10, CON: 11, INT: 2, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Ram", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 1, AvgDamage: 3, DamageType: "bludgeoning"}}, Traits: []string{"Charge", "Sure-Footed"}},
+		"hawk":                      {Slug: "hawk", Name: "Hawk", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 13, SpeedWalk: 10, STR: 5, DEX: 16, CON: 8, INT: 2, WIS: 14, CHA: 6, Traits: []string{"Keen Sight"}},
+		"homunculus":                {Slug: "homunculus", Name: "Homunculus", Size: "tiny", Type: "construct", CR: 0, XP: 10, HP: 5, AC: 13, SpeedWalk: 20, STR: 4, DEX: 15, CON: 11, INT: 10, WIS: 10, CHA: 7, Traits: []string{"Telepathic Bond"}},
+		"hyena":                     {Slug: "hyena", Name: "Hyena", Size: "medium", Type: "beast", CR: 0, XP: 10, HP: 5, AC: 11, SpeedWalk: 50, STR: 11, DEX: 13, CON: 12, INT: 2, WIS: 12, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 2, DamageDice: "1d6", DamageBonus: 0, AvgDamage: 3, DamageType: "piercing"}}, Traits: []string{"Pack Tactics"}},
+		"jackal":                    {Slug: "jackal", Name: "Jackal", Size: "small", Type: "beast", CR: 0, XP: 10, HP: 3, AC: 12, SpeedWalk: 40, STR: 8, DEX: 15, CON: 11, INT: 3, WIS: 12, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 1, DamageDice: "1d4", DamageBonus: -1, AvgDamage: 1, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Smell", "Pack Tactics"}},
+		"lemure":                    {Slug: "lemure", Name: "Lemure", Size: "medium", Type: "fiend", CR: 0, XP: 10, HP: 13, AC: 7, SpeedWalk: 15, STR: 10, DEX: 5, CON: 11, INT: 1, WIS: 11, CHA: 3, Attacks: []SRDStatAttack{{Name: "Fist", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 0, AvgDamage: 2, DamageType: "bludgeoning"}}, Traits: []string{"Devil's Sight", "Hellish Rejuvenation"}},
+		"lizard":                    {Slug: "lizard", Name: "Lizard", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 2, AC: 10, SpeedWalk: 20, STR: 2, DEX: 11, CON: 10, INT: 1, WIS: 8, CHA: 3},
+		"octopus":                   {Slug: "octopus", Name: "Octopus", Size: "small", Type: "beast", CR: 0, XP: 10, HP: 3, AC: 12, SpeedWalk: 5, STR: 4, DEX: 15, CON: 11, INT: 3, WIS: 10, CHA: 4, Traits: []string{"Hold Breath", "Underwater Camouflage", "Water Breathing"}},
+		"owl":                       {Slug: "owl", Name: "Owl", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 11, SpeedWalk: 5, STR: 3, DEX: 13, CON: 8, INT: 2, WIS: 12, CHA: 7, Traits: []string{"Flyby", "Keen Hearing and Sight"}},
+		"quipper":                   {Slug: "quipper", Name: "Quipper", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 13, SpeedWalk: 40, STR: 2, DEX: 16, CON: 9, INT: 1, WIS: 7, CHA: 2, Traits: []string{"Blood Frenzy", "Water Breathing"}},
+		"rat":                       {Slug: "rat", Name: "Rat", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 10, SpeedWalk: 20, STR: 2, DEX: 11, CON: 9, INT: 2, WIS: 10, CHA: 4, Traits: []string{"Keen Smell"}},
+		"raven":                     {Slug: "raven", Name: "Raven", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 12, SpeedWalk: 10, STR: 2, DEX: 14, CON: 8, INT: 2, WIS: 12, CHA: 6, Traits: []string{"Mimicry"}},
+		"scorpion":                  {Slug: "scorpion", Name: "Scorpion", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 11, SpeedWalk: 10, STR: 2, DEX: 11, CON: 8, INT: 1, WIS: 8, CHA: 2},
+		"sea_horse":                 {Slug: "sea_horse", Name: "Sea Horse", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 11, SpeedWalk: 20, STR: 1, DEX: 12, CON: 8, INT: 1, WIS: 10, CHA: 2, Traits: []string{"Water Breathing"}},
+		"shrieker":                  {Slug: "shrieker", Name: "Shrieker", Size: "medium", Type: "plant", CR: 0, XP: 10, HP: 13, AC: 5, STR: 1, DEX: 1, CON: 10, INT: 1, WIS: 3, CHA: 1, Traits: []string{"False Appearance"}},
+		"spider":                    {Slug: "spider", Name: "Spider", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 12, SpeedWalk: 20, STR: 2, DEX: 14, CON: 8, INT: 1, WIS: 10, CHA: 2, Traits: []string{"Spider Climb", "Web Sense", "Web Walker"}},
+		"vulture":                   {Slug: "vulture", Name: "Vulture", Size: "medium", Type: "beast", CR: 0, XP: 10, HP: 5, AC: 10, SpeedWalk: 10, STR: 7, DEX: 10, CON: 13, INT: 2, WIS: 12, CHA: 4, Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 2, DamageDice: "1d4", DamageBonus: 0, AvgDamage: 2, DamageType: "piercing"}}, Traits: []string{"Keen Sight and Smell", "Pack Tactics"}},
+		"weasel":                    {Slug: "weasel", Name: "Weasel", Size: "tiny", Type: "beast", CR: 0, XP: 10, HP: 1, AC: 13, SpeedWalk: 30, STR: 3, DEX: 16, CON: 8, INT: 2, WIS: 12, CHA: 3, Traits: []string{"Keen Hearing and Smell"}},
+		"bandit":                    {Slug: "bandit", Name: "Bandit", Size: "medium", Type: "humanoid", CR: 0.125, XP: 25, HP: 11, AC: 12, SpeedWalk: 30, STR: 11, DEX: 12, CON: 12, INT: 10, WIS: 10, CHA: 10, Attacks: []SRDStatAttack{{Name: "Scimitar", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "slashing"}, {Name: "Light Crossbow", AttackBonus: 3, DamageDice: "1d8", DamageBonus: 1, AvgDamage: 5, DamageType: "piercing"}}},
+		"blood_hawk":                {Slug: "blood_hawk", Name: "Blood Hawk", Size: "small", Type: "beast", CR: 0.125, XP: 25, HP: 7, AC: 12, SpeedWalk: 10, STR: 6, DEX: 14, CON: 10, INT: 3, WIS: 14, CHA: 5, Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Keen Sight", "Pack Tactics"}},
+		"camel":                     {Slug: "camel", Name: "Camel", Size: "large", Type: "beast", CR: 0.125, XP: 25, HP: 15, AC: 9, SpeedWalk: 50, STR: 16, DEX: 8, CON: 14, INT: 2, WIS: 8, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 0, AvgDamage: 2, DamageType: "bludgeoning"}}},
+		"cultist":                   {Slug: "cultist", Name: "Cultist", Size: "medium", Type: "humanoid", CR: 0.125, XP: 25, HP: 9, AC: 12, SpeedWalk: 30, STR: 11, DEX: 12, CON: 10, INT: 10, WIS: 11, CHA: 10, Attacks: []SRDStatAttack{{Name: "Scimitar", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "slashing"}}, Traits: []string{"Dark Devotion"}},
+		"flying_snake":              {Slug: "flying_snake", Name: "Flying Snake", Size: "tiny", Type: "beast", CR: 0.125, XP: 25, HP: 5, AC: 14, SpeedWalk: 30, STR: 4, DEX: 18, CON: 11, INT: 2, WIS: 12, CHA: 5, Traits: []string{"Flyby"}},
+		"giant_crab":                {Slug: "giant_crab", Name: "Giant Crab", Size: "medium", Type: "beast", CR: 0.125, XP: 25, HP: 13, AC: 15, SpeedWalk: 30, STR: 13, DEX: 15, CON: 11, INT: 1, WIS: 9, CHA: 3, Attacks: []SRDStatAttack{{Name: "Claw", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Amphibious"}},
+		"giant_rat":                 {Slug: "giant_rat", Name: "Giant Rat", Size: "small", Type: "beast", CR: 0.125, XP: 25, HP: 7, AC: 12, SpeedWalk: 30, STR: 7, DEX: 15, CON: 11, INT: 2, WIS: 10, CHA: 4, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Keen Smell", "Pack Tactics"}},
+		"giant_rat_diseased":        {Slug: "giant_rat_diseased", Name: "Giant Rat (Diseased)", Size: "small", Type: "beast", CR: 0.125, XP: 25, HP: 7, AC: 12, SpeedWalk: 30, STR: 7, DEX: 15, CON: 11, INT: 2, WIS: 10, CHA: 4, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}},
+		"giant_weasel":              {Slug: "giant_weasel", Name: "Giant Weasel", Size: "medium", Type: "beast", CR: 0.125, XP: 25, HP: 9, AC: 13, SpeedWalk: 40, STR: 11, DEX: 16, CON: 10, INT: 4, WIS: 12, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 3, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Smell"}},
+		"guard":                     {Slug: "guard", Name: "Guard", Size: "medium", Type: "humanoid", CR: 0.125, XP: 25, HP: 11, AC: 16, SpeedWalk: 30, STR: 13, DEX: 12, CON: 12, INT: 10, WIS: 11, CHA: 10, Attacks: []SRDStatAttack{{Name: "Spear", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}}},
+		"kobold":                    {Slug: "kobold", Name: "Kobold", Size: "small", Type: "humanoid", CR: 0.125, XP: 25, HP: 5, AC: 12, SpeedWalk: 30, STR: 7, DEX: 15, CON: 9, INT: 8, WIS: 7, CHA: 8, Attacks: []SRDStatAttack{{Name: "Dagger", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}, {Name: "Sling", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Sunlight Sensitivity", "Pack Tactics"}},
+		"mastiff":                   {Slug: "mastiff", Name: "Mastiff", Size: "medium", Type: "beast", CR: 0.125, XP: 25, HP: 5, AC: 12, SpeedWalk: 40, STR: 13, DEX: 14, CON: 12, INT: 3, WIS: 12, CHA: 7, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Smell"}},
+		"merfolk":                   {Slug: "merfolk", Name: "Merfolk", Size: "medium", Type: "humanoid", CR: 0.125, XP: 25, HP: 11, AC: 11, SpeedWalk: 10, STR: 10, DEX: 13, CON: 12, INT: 11, WIS: 11, CHA: 12, Attacks: []SRDStatAttack{{Name: "Spear", AttackBonus: 2, DamageDice: "1d6", DamageBonus: 0, AvgDamage: 3, DamageType: "piercing"}}, Traits: []string{"Amphibious"}},
+		"mule":                      {Slug: "mule", Name: "Mule", Size: "medium", Type: "beast", CR: 0.125, XP: 25, HP: 11, AC: 10, SpeedWalk: 40, STR: 14, DEX: 10, CON: 13, INT: 2, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Beast of Burden", "Sure-Footed"}},
+		"noble":                     {Slug: "noble", Name: "Noble", Size: "medium", Type: "humanoid", CR: 0.125, XP: 25, HP: 9, AC: 15, SpeedWalk: 30, STR: 11, DEX: 12, CON: 11, INT: 12, WIS: 14, CHA: 16, Attacks: []SRDStatAttack{{Name: "Rapier", AttackBonus: 3, DamageDice: "1d8", DamageBonus: 1, AvgDamage: 5, DamageType: "piercing"}}},
+		"poisonous_snake":           {Slug: "poisonous_snake", Name: "Poisonous Snake", Size: "tiny", Type: "beast", CR: 0.125, XP: 25, HP: 2, AC: 13, SpeedWalk: 30, STR: 2, DEX: 16, CON: 11, INT: 1, WIS: 10, CHA: 3},
+		"pony":                      {Slug: "pony", Name: "Pony", Size: "medium", Type: "beast", CR: 0.125, XP: 25, HP: 11, AC: 10, SpeedWalk: 40, STR: 15, DEX: 10, CON: 13, INT: 2, WIS: 11, CHA: 7, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 4, DamageDice: "2d4", DamageBonus: 2, AvgDamage: 7, DamageType: "bludgeoning"}}},
+		"stirge":                    {Slug: "stirge", Name: "Stirge", Size: "tiny", Type: "beast", CR: 0.125, XP: 25, HP: 2, AC: 14, SpeedWalk: 10, STR: 4, DEX: 16, CON: 11, INT: 2, WIS: 8, CHA: 6, Attacks: []SRDStatAttack{{Name: "Blood Drain", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 3, AvgDamage: 5, DamageType: "piercing"}}},
+		"tribal_warrior":            {Slug: "tribal_warrior", Name: "Tribal Warrior", Size: "medium", Type: "humanoid", CR: 0.125, XP: 25, HP: 11, AC: 12, SpeedWalk: 30, STR: 13, DEX: 11, CON: 12, INT: 8, WIS: 11, CHA: 8, Attacks: []SRDStatAttack{{Name: "Spear", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Pack Tactics"}},
+		"acolyte":                   {Slug: "acolyte", Name: "Acolyte", Size: "medium", Type: "humanoid", CR: 0.25, XP: 50, HP: 9, AC: 10, SpeedWalk: 30, STR: 10, DEX: 10, CON: 10, INT: 10, WIS: 14, CHA: 11, Attacks: []SRDStatAttack{{Name: "Club", AttackBonus: 2, DamageDice: "1d4", DamageBonus: 0, AvgDamage: 2, DamageType: "bludgeoning"}}, Traits: []string{"Spellcasting"}},
+		"axe_beak":                  {Slug: "axe_beak", Name: "Axe Beak", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 19, AC: 11, SpeedWalk: 50, STR: 14, DEX: 12, CON: 12, INT: 2, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "slashing"}}},
+		"blink_dog":                 {Slug: "blink_dog", Name: "Blink Dog", Size: "medium", Type: "fey", CR: 0.25, XP: 50, HP: 22, AC: 13, SpeedWalk: 40, STR: 12, DEX: 17, CON: 12, INT: 10, WIS: 13, CHA: 11, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Smell"}},
+		"boar":                      {Slug: "boar", Name: "Boar", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 11, AC: 11, SpeedWalk: 40, STR: 13, DEX: 11, CON: 12, INT: 2, WIS: 9, CHA: 5, Attacks: []SRDStatAttack{{Name: "Tusk", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "slashing"}}, Traits: []string{"Charge", "Relentless (Recharges after a Short or Long Rest)"}},
+		"constrictor_snake":         {Slug: "constrictor_snake", Name: "Constrictor Snake", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 13, AC: 12, SpeedWalk: 30, STR: 15, DEX: 14, CON: 12, INT: 1, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Constrict", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "bludgeoning"}}},
+		"draft_horse":               {Slug: "draft_horse", Name: "Draft Horse", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 19, AC: 10, SpeedWalk: 40, STR: 18, DEX: 10, CON: 12, INT: 2, WIS: 11, CHA: 7, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 6, DamageDice: "2d4", DamageBonus: 4, AvgDamage: 9, DamageType: "bludgeoning"}}},
+		"dretch":                    {Slug: "dretch", Name: "Dretch", Size: "small", Type: "fiend", CR: 0.25, XP: 50, HP: 18, AC: 11, SpeedWalk: 20, STR: 11, DEX: 11, CON: 12, INT: 5, WIS: 8, CHA: 3, Multiattack: "The dretch makes two attacks: one with its bite and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 2, DamageDice: "1d6", DamageBonus: 0, AvgDamage: 3, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 2, DamageDice: "2d4", DamageBonus: 0, AvgDamage: 5, DamageType: "slashing"}}},
+		"drow":                      {Slug: "drow", Name: "Drow", Size: "medium", Type: "humanoid", CR: 0.25, XP: 50, HP: 13, AC: 15, SpeedWalk: 30, STR: 10, DEX: 14, CON: 10, INT: 11, WIS: 11, CHA: 12, Attacks: []SRDStatAttack{{Name: "Shortsword", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Hand Crossbow", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Fey Ancestry", "Innate Spellcasting", "Sunlight Sensitivity"}},
+		"elk":                       {Slug: "elk", Name: "Elk", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 13, AC: 10, SpeedWalk: 50, STR: 16, DEX: 10, CON: 12, INT: 2, WIS: 10, CHA: 6, Traits: []string{"Charge"}},
+		"flying_sword":              {Slug: "flying_sword", Name: "Flying Sword", Size: "small", Type: "construct", CR: 0.25, XP: 50, HP: 17, AC: 17, SpeedWalk: 50, STR: 12, DEX: 15, CON: 11, INT: 1, WIS: 5, CHA: 1, Attacks: []SRDStatAttack{{Name: "Longsword", AttackBonus: 3, DamageDice: "1d8", DamageBonus: 1, AvgDamage: 5, DamageType: "slashing"}}, Traits: []string{"Antimagic Susceptibility", "False Appearance"}},
+		"giant_badger":              {Slug: "giant_badger", Name: "Giant Badger", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 13, AC: 10, SpeedWalk: 30, STR: 13, DEX: 10, CON: 15, INT: 2, WIS: 12, CHA: 5, Multiattack: "The badger makes two attacks: one with its bite and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 3, DamageDice: "2d4", DamageBonus: 1, AvgDamage: 6, DamageType: "slashing"}}, Traits: []string{"Keen Smell"}},
+		"giant_bat":                 {Slug: "giant_bat", Name: "Giant Bat", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 22, AC: 13, SpeedWalk: 10, STR: 15, DEX: 16, CON: 11, INT: 2, WIS: 12, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Echolocation", "Keen Hearing"}},
+		"giant_centipede":           {Slug: "giant_centipede", Name: "Giant Centipede", Size: "small", Type: "beast", CR: 0.25, XP: 50, HP: 4, AC: 13, SpeedWalk: 30, STR: 5, DEX: 14, CON: 12, INT: 1, WIS: 7, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}},
+		"giant_frog":                {Slug: "giant_frog", Name: "Giant Frog", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 18, AC: 11, SpeedWalk: 30, STR: 12, DEX: 13, CON: 11, INT: 2, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Amphibious", "Standing Leap"}},
+		"giant_lizard":              {Slug: "giant_lizard", Name: "Giant Lizard", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 19, AC: 12, SpeedWalk: 30, STR: 15, DEX: 12, CON: 13, INT: 2, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Variant: Hold Breath", "Variant: Spider Climb"}},
+		"giant_owl":                 {Slug: "giant_owl", Name: "Giant Owl", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 19, AC: 12, SpeedWalk: 5, STR: 13, DEX: 15, CON: 12, INT: 8, WIS: 13, CHA: 10, Attacks: []SRDStatAttack{{Name: "Talons", AttackBonus: 3, DamageDice: "2d6", DamageBonus: 1, AvgDamage: 8, DamageType: "slashing"}}, Traits: []string{"Flyby", "Keen Hearing and Sight"}},
+		"giant_poisonous_snake":     {Slug: "giant_poisonous_snake", Name: "Giant Poisonous Snake", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 11, AC: 14, SpeedWalk: 30, STR: 10, DEX: 18, CON: 13, INT: 2, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "1d4", DamageBonus: 4, AvgDamage: 6, DamageType: "piercing"}}},
+		"giant_wolf_spider":         {Slug: "giant_wolf_spider", Name: "Giant Wolf Spider", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 11, AC: 13, SpeedWalk: 40, STR: 12, DEX: 16, CON: 13, INT: 3, WIS: 12, CHA: 4, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Spider Climb", "Web Sense", "Web Walker"}},
+		"goblin":                    {Slug: "goblin", Name: "Goblin", Size: "small", Type: "humanoid", CR: 0.25, XP: 50, HP: 7, AC: 15, SpeedWalk: 30, STR: 8, DEX: 14, CON: 10, INT: 10, WIS: 8, CHA: 8, Attacks: []SRDStatAttack{{Name: "Scimitar", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "slashing"}, {Name: "Shortbow", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Nimble Escape"}},
+		"grimlock":                  {Slug: "grimlock", Name: "Grimlock", Size: "medium", Type: "humanoid", CR: 0.25, XP: 50, HP: 11, AC: 11, SpeedWalk: 30, STR: 16, DEX: 12, CON: 12, INT: 9, WIS: 8, CHA: 6, Attacks: []SRDStatAttack{{Name: "Spiked Bone Club", AttackBonus: 5, DamageDice: "1d4+1d4", DamageBonus: 5, AvgDamage: 5, DamageType: "bludgeoning"}}, Traits: []string{"Blind Senses", "Keen Hearing and Smell", "Stone Camouflage"}},
+		"panther":                   {Slug: "panther", Name: "Panther", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 13, AC: 12, SpeedWalk: 50, STR: 14, DEX: 15, CON: 10, INT: 3, WIS: 14, CHA: 7, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "slashing"}}, Traits: []string{"Keen Smell", "Pounce"}},
+		"pseudodragon":              {Slug: "pseudodragon", Name: "Pseudodragon", Size: "tiny", Type: "dragon", CR: 0.25, XP: 50, HP: 7, AC: 13, SpeedWalk: 15, STR: 6, DEX: 15, CON: 13, INT: 10, WIS: 12, CHA: 10, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}, {Name: "Sting", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Keen Senses", "Magic Resistance", "Limited Telepathy", "Variant: Familiar"}},
+		"riding_horse":              {Slug: "riding_horse", Name: "Riding Horse", Size: "large", Type: "beast", CR: 0.25, XP: 50, HP: 13, AC: 10, SpeedWalk: 60, STR: 16, DEX: 10, CON: 12, INT: 2, WIS: 11, CHA: 7, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 5, DamageDice: "2d4", DamageBonus: 3, AvgDamage: 8, DamageType: "bludgeoning"}}},
+		"skeleton":                  {Slug: "skeleton", Name: "Skeleton", Size: "medium", Type: "undead", CR: 0.25, XP: 50, HP: 13, AC: 13, SpeedWalk: 30, STR: 10, DEX: 14, CON: 15, INT: 6, WIS: 8, CHA: 5, Attacks: []SRDStatAttack{{Name: "Shortsword", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Shortbow", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}},
+		"sprite":                    {Slug: "sprite", Name: "Sprite", Size: "tiny", Type: "fey", CR: 0.25, XP: 50, HP: 2, AC: 15, SpeedWalk: 10, STR: 3, DEX: 18, CON: 10, INT: 14, WIS: 13, CHA: 11},
+		"steam_mephit":              {Slug: "steam_mephit", Name: "Steam Mephit", Size: "small", Type: "elemental", CR: 0.25, XP: 50, HP: 21, AC: 10, SpeedWalk: 30, STR: 5, DEX: 11, CON: 10, INT: 11, WIS: 10, CHA: 12, Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 2, DamageDice: "2d4", DamageBonus: 0, AvgDamage: 5, DamageType: "slashing"}}, Traits: []string{"Death Burst", "Innate Spellcasting (1/Day)"}},
+		"swarm_of_bats":             {Slug: "swarm_of_bats", Name: "Swarm of Bats", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 22, AC: 12, SpeedWalk: 30, STR: 5, DEX: 15, CON: 10, INT: 2, WIS: 12, CHA: 4, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 4, DamageDice: "2d4", DamageBonus: 0, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Echolocation", "Keen Hearing", "Swarm"}},
+		"swarm_of_rats":             {Slug: "swarm_of_rats", Name: "Swarm of Rats", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 24, AC: 10, SpeedWalk: 30, STR: 9, DEX: 11, CON: 9, INT: 2, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 2, DamageDice: "2d6", DamageBonus: 0, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Keen Smell", "Swarm"}},
+		"swarm_of_ravens":           {Slug: "swarm_of_ravens", Name: "Swarm of Ravens", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 24, AC: 12, SpeedWalk: 10, STR: 6, DEX: 14, CON: 8, INT: 3, WIS: 12, CHA: 6, Attacks: []SRDStatAttack{{Name: "Beaks", AttackBonus: 4, DamageDice: "2d6", DamageBonus: 0, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Swarm"}},
+		"violet_fungus":             {Slug: "violet_fungus", Name: "Violet Fungus", Size: "medium", Type: "plant", CR: 0.25, XP: 50, HP: 18, AC: 5, SpeedWalk: 5, STR: 3, DEX: 1, CON: 10, INT: 1, WIS: 3, CHA: 1, Multiattack: "The fungus makes 1d4 Rotting Touch attacks.", Attacks: []SRDStatAttack{{Name: "Rotting Touch", AttackBonus: 2, DamageDice: "1d8", DamageBonus: 0, AvgDamage: 4, DamageType: "necrotic"}}, Traits: []string{"False Appearance"}},
+		"wolf":                      {Slug: "wolf", Name: "Wolf", Size: "medium", Type: "beast", CR: 0.25, XP: 50, HP: 11, AC: 13, SpeedWalk: 40, STR: 12, DEX: 15, CON: 12, INT: 3, WIS: 12, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "2d4", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Smell", "Pack Tactics"}},
+		"zombie":                    {Slug: "zombie", Name: "Zombie", Size: "medium", Type: "undead", CR: 0.25, XP: 50, HP: 22, AC: 8, SpeedWalk: 20, STR: 13, DEX: 6, CON: 16, INT: 3, WIS: 6, CHA: 5, Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Undead Fortitude"}},
+		"ape":                       {Slug: "ape", Name: "Ape", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 19, AC: 12, SpeedWalk: 30, STR: 16, DEX: 14, CON: 14, INT: 6, WIS: 12, CHA: 7, Multiattack: "The ape makes two fist attacks.", Attacks: []SRDStatAttack{{Name: "Fist", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "bludgeoning"}, {Name: "Rock", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "bludgeoning"}}},
+		"black_bear":                {Slug: "black_bear", Name: "Black Bear", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 19, AC: 11, SpeedWalk: 40, STR: 15, DEX: 10, CON: 14, INT: 2, WIS: 12, CHA: 7, Multiattack: "The bear makes two attacks: one with its bite and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 3, DamageDice: "2d4", DamageBonus: 2, AvgDamage: 7, DamageType: "slashing"}}, Traits: []string{"Keen Smell"}},
+		"cockatrice":                {Slug: "cockatrice", Name: "Cockatrice", Size: "small", Type: "monstrosity", CR: 0.5, XP: 100, HP: 27, AC: 11, SpeedWalk: 20, STR: 6, DEX: 12, CON: 12, INT: 2, WIS: 13, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 1, AvgDamage: 3, DamageType: "piercing"}}},
+		"crocodile":                 {Slug: "crocodile", Name: "Crocodile", Size: "large", Type: "beast", CR: 0.5, XP: 100, HP: 19, AC: 12, SpeedWalk: 20, STR: 15, DEX: 10, CON: 13, INT: 2, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Hold Breath"}},
+		"darkmantle":                {Slug: "darkmantle", Name: "Darkmantle", Size: "small", Type: "monstrosity", CR: 0.5, XP: 100, HP: 22, AC: 11, SpeedWalk: 10, STR: 16, DEX: 12, CON: 13, INT: 2, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Crush", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "bludgeoning"}}, Traits: []string{"Echolocation", "False Appearance"}},
+		"deep_gnome_svirfneblin":    {Slug: "deep_gnome_svirfneblin", Name: "Deep Gnome (Svirfneblin)", Size: "small", Type: "humanoid", CR: 0.5, XP: 100, HP: 16, AC: 15, SpeedWalk: 20, STR: 15, DEX: 14, CON: 14, INT: 12, WIS: 10, CHA: 9, Attacks: []SRDStatAttack{{Name: "War Pick", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}, {Name: "Poisoned Dart", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Stone Camouflage", "Gnome Cunning", "Innate Spellcasting"}},
+		"dust_mephit":               {Slug: "dust_mephit", Name: "Dust Mephit", Size: "small", Type: "elemental", CR: 0.5, XP: 100, HP: 17, AC: 12, SpeedWalk: 30, STR: 5, DEX: 14, CON: 10, INT: 9, WIS: 11, CHA: 10, Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "slashing"}}, Traits: []string{"Death Burst", "Innate Spellcasting (1/Day)"}},
+		"giant_goat":                {Slug: "giant_goat", Name: "Giant Goat", Size: "large", Type: "beast", CR: 0.5, XP: 100, HP: 19, AC: 11, SpeedWalk: 40, STR: 17, DEX: 11, CON: 12, INT: 3, WIS: 12, CHA: 6, Attacks: []SRDStatAttack{{Name: "Ram", AttackBonus: 5, DamageDice: "2d4", DamageBonus: 3, AvgDamage: 8, DamageType: "bludgeoning"}}, Traits: []string{"Charge", "Sure-Footed"}},
+		"giant_sea_horse":           {Slug: "giant_sea_horse", Name: "Giant Sea Horse", Size: "large", Type: "beast", CR: 0.5, XP: 100, HP: 16, AC: 13, SpeedWalk: 40, STR: 12, DEX: 15, CON: 11, INT: 2, WIS: 12, CHA: 5, Attacks: []SRDStatAttack{{Name: "Ram", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Charge", "Water Breathing"}},
+		"giant_wasp":                {Slug: "giant_wasp", Name: "Giant Wasp", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 13, AC: 12, SpeedWalk: 10, STR: 10, DEX: 14, CON: 10, INT: 1, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Sting", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}},
+		"gnoll":                     {Slug: "gnoll", Name: "Gnoll", Size: "medium", Type: "humanoid", CR: 0.5, XP: 100, HP: 22, AC: 15, SpeedWalk: 30, STR: 14, DEX: 12, CON: 11, INT: 6, WIS: 10, CHA: 7, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}, {Name: "Spear", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Longbow", AttackBonus: 3, DamageDice: "1d8", DamageBonus: 1, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Rampage"}},
+		"gray_ooze":                 {Slug: "gray_ooze", Name: "Gray Ooze", Size: "medium", Type: "ooze", CR: 0.5, XP: 100, HP: 22, AC: 8, SpeedWalk: 10, STR: 12, DEX: 6, CON: 16, INT: 1, WIS: 6, CHA: 2, Attacks: []SRDStatAttack{{Name: "Pseudopod", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Amorphous", "Corrode Metal", "False Appearance"}},
+		"hobgoblin":                 {Slug: "hobgoblin", Name: "Hobgoblin", Size: "medium", Type: "humanoid", CR: 0.5, XP: 100, HP: 11, AC: 18, SpeedWalk: 30, STR: 13, DEX: 12, CON: 12, INT: 10, WIS: 10, CHA: 9, Attacks: []SRDStatAttack{{Name: "Longsword", AttackBonus: 3, DamageDice: "1d8", DamageBonus: 1, AvgDamage: 5, DamageType: "slashing"}, {Name: "Longbow", AttackBonus: 3, DamageDice: "1d8", DamageBonus: 1, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Martial Advantage"}},
+		"ice_mephit":                {Slug: "ice_mephit", Name: "Ice Mephit", Size: "small", Type: "elemental", CR: 0.5, XP: 100, HP: 21, AC: 11, SpeedWalk: 30, STR: 7, DEX: 13, CON: 10, INT: 9, WIS: 11, CHA: 12, Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 1, AvgDamage: 3, DamageType: "slashing"}}, Traits: []string{"Death Burst", "False Appearance", "Innate Spellcasting (1/Day)"}},
+		"lizardfolk":                {Slug: "lizardfolk", Name: "Lizardfolk", Size: "medium", Type: "humanoid", CR: 0.5, XP: 100, HP: 22, AC: 15, SpeedWalk: 30, STR: 15, DEX: 10, CON: 13, INT: 7, WIS: 12, CHA: 7, Multiattack: "The lizardfolk makes two melee attacks, each one with a different weapon.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Heavy Club", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "bludgeoning"}, {Name: "Javelin", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Spiked Shield", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Hold Breath"}},
+		"magma_mephit":              {Slug: "magma_mephit", Name: "Magma Mephit", Size: "small", Type: "elemental", CR: 0.5, XP: 100, HP: 22, AC: 11, SpeedWalk: 30, STR: 8, DEX: 12, CON: 12, INT: 7, WIS: 10, CHA: 10, Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 1, AvgDamage: 3, DamageType: "slashing"}}, Traits: []string{"Death Burst", "False Appearance", "Innate Spellcasting (1/Day)"}},
+		"magmin":                    {Slug: "magmin", Name: "Magmin", Size: "small", Type: "elemental", CR: 0.5, XP: 100, HP: 9, AC: 14, SpeedWalk: 30, STR: 7, DEX: 15, CON: 12, INT: 8, WIS: 11, CHA: 10, Attacks: []SRDStatAttack{{Name: "Touch", AttackBonus: 4, DamageDice: "2d6", DamageBonus: 0, AvgDamage: 7, DamageType: "fire"}}, Traits: []string{"Death Burst", "Ignited Illumination"}},
+		"orc":                       {Slug: "orc", Name: "Orc", Size: "medium", Type: "humanoid", CR: 0.5, XP: 100, HP: 15, AC: 13, SpeedWalk: 30, STR: 16, DEX: 12, CON: 16, INT: 7, WIS: 11, CHA: 10, Attacks: []SRDStatAttack{{Name: "Greataxe", AttackBonus: 5, DamageDice: "1d12", DamageBonus: 3, AvgDamage: 9, DamageType: "slashing"}, {Name: "Javelin", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Aggressive"}},
+		"reef_shark":                {Slug: "reef_shark", Name: "Reef Shark", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 22, AC: 12, SpeedWalk: 40, STR: 14, DEX: 13, CON: 13, INT: 1, WIS: 10, CHA: 4, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Pack Tactics", "Water Breathing"}},
+		"rust_monster":              {Slug: "rust_monster", Name: "Rust Monster", Size: "medium", Type: "monstrosity", CR: 0.5, XP: 100, HP: 27, AC: 14, SpeedWalk: 40, STR: 13, DEX: 12, CON: 13, INT: 2, WIS: 13, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d8", DamageBonus: 1, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Iron Scent", "Rust Metal"}},
+		"sahuagin":                  {Slug: "sahuagin", Name: "Sahuagin", Size: "medium", Type: "humanoid", CR: 0.5, XP: 100, HP: 22, AC: 12, SpeedWalk: 30, STR: 13, DEX: 11, CON: 12, INT: 12, WIS: 13, CHA: 9, Multiattack: "The sahuagin makes two melee attacks: one with its bite and one with its claws or spear.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 1, AvgDamage: 3, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 1, AvgDamage: 3, DamageType: "slashing"}, {Name: "Spear", AttackBonus: 3, DamageDice: "1d6", DamageBonus: 1, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Blood Frenzy", "Limited Amphibiousness", "Shark Telepathy"}},
+		"satyr":                     {Slug: "satyr", Name: "Satyr", Size: "medium", Type: "fey", CR: 0.5, XP: 100, HP: 31, AC: 14, SpeedWalk: 40, STR: 12, DEX: 16, CON: 11, INT: 12, WIS: 10, CHA: 14, Attacks: []SRDStatAttack{{Name: "Ram", AttackBonus: 3, DamageDice: "2d4", DamageBonus: 1, AvgDamage: 6, DamageType: "bludgeoning"}, {Name: "Shortsword", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}, {Name: "Shortbow", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Magic Resistance"}},
+		"scout":                     {Slug: "scout", Name: "Scout", Size: "medium", Type: "humanoid", CR: 0.5, XP: 100, HP: 16, AC: 13, SpeedWalk: 30, STR: 11, DEX: 14, CON: 12, INT: 11, WIS: 13, CHA: 11, Multiattack: "The scout makes two melee attacks or two ranged attacks.", Attacks: []SRDStatAttack{{Name: "Shortsword", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Longbow", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Sight"}},
+		"shadow":                    {Slug: "shadow", Name: "Shadow", Size: "medium", Type: "undead", CR: 0.5, XP: 100, HP: 16, AC: 12, SpeedWalk: 40, STR: 6, DEX: 14, CON: 13, INT: 6, WIS: 10, CHA: 8, Attacks: []SRDStatAttack{{Name: "Strength Drain", AttackBonus: 4, DamageDice: "2d6", DamageBonus: 2, AvgDamage: 9, DamageType: "necrotic"}}, Traits: []string{"Amorphous", "Shadow Stealth", "Sunlight Weakness"}},
+		"swarm_of_beetles":          {Slug: "swarm_of_beetles", Name: "Swarm of Beetles", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 22, AC: 12, SpeedWalk: 20, STR: 3, DEX: 13, CON: 10, INT: 1, WIS: 7, CHA: 1, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 3, DamageDice: "4d4", DamageBonus: 0, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Swarm"}},
+		"swarm_of_centipedes":       {Slug: "swarm_of_centipedes", Name: "Swarm of Centipedes", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 22, AC: 12, SpeedWalk: 20, STR: 3, DEX: 13, CON: 10, INT: 1, WIS: 7, CHA: 1, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 3, DamageDice: "4d4", DamageBonus: 0, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Swarm"}},
+		"swarm_of_insects":          {Slug: "swarm_of_insects", Name: "Swarm of Insects", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 22, AC: 12, SpeedWalk: 20, STR: 3, DEX: 13, CON: 10, INT: 1, WIS: 7, CHA: 1, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 3, DamageDice: "4d4", DamageBonus: 0, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Swarm"}},
+		"swarm_of_spiders":          {Slug: "swarm_of_spiders", Name: "Swarm of Spiders", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 22, AC: 12, SpeedWalk: 20, STR: 3, DEX: 13, CON: 10, INT: 1, WIS: 7, CHA: 1, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 3, DamageDice: "4d4", DamageBonus: 0, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Swarm", "Spider Climb", "Web Sense", "Web Walker"}},
+		"swarm_of_wasps":            {Slug: "swarm_of_wasps", Name: "Swarm of Wasps", Size: "medium", Type: "beast", CR: 0.5, XP: 100, HP: 22, AC: 12, SpeedWalk: 5, STR: 3, DEX: 13, CON: 10, INT: 1, WIS: 7, CHA: 1, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 3, DamageDice: "4d4", DamageBonus: 0, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Swarm"}},
+		"thug":                      {Slug: "thug", Name: "Thug", Size: "medium", Type: "humanoid", CR: 0.5, XP: 100, HP: 32, AC: 11, SpeedWalk: 30, STR: 15, DEX: 11, CON: 14, INT: 10, WIS: 10, CHA: 11, Multiattack: "The thug makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Mace", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "bludgeoning"}, {Name: "Heavy Crossbow", AttackBonus: 2, DamageDice: "1d10", DamageBonus: 0, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Pack Tactics"}},
+		"warhorse":                  {Slug: "warhorse", Name: "Warhorse", Size: "large", Type: "beast", CR: 0.5, XP: 100, HP: 19, AC: 11, SpeedWalk: 60, STR: 18, DEX: 12, CON: 13, INT: 2, WIS: 12, CHA: 7, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}}, Traits: []string{"Trampling Charge"}},
+		"warhorse_skeleton":         {Slug: "warhorse_skeleton", Name: "Warhorse Skeleton", Size: "large", Type: "undead", CR: 0.5, XP: 100, HP: 22, AC: 13, SpeedWalk: 60, STR: 18, DEX: 12, CON: 15, INT: 2, WIS: 8, CHA: 5, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}}},
+		"worg":                      {Slug: "worg", Name: "Worg", Size: "large", Type: "monstrosity", CR: 0.5, XP: 100, HP: 26, AC: 13, SpeedWalk: 50, STR: 16, DEX: 13, CON: 13, INT: 7, WIS: 11, CHA: 8, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Smell"}},
+		"animated_armor":            {Slug: "animated_armor", Name: "Animated Armor", Size: "medium", Type: "construct", CR: 1, XP: 200, HP: 33, AC: 18, SpeedWalk: 25, STR: 14, DEX: 11, CON: 13, INT: 1, WIS: 3, CHA: 1, Multiattack: "The armor makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "bludgeoning"}}, Traits: []string{"Antimagic Susceptibility", "False Appearance"}},
+		"brass_dragon_wyrmling":     {Slug: "brass_dragon_wyrmling", Name: "Brass Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 1, XP: 200, HP: 16, AC: 16, SpeedWalk: 30, STR: 15, DEX: 10, CON: 13, INT: 10, WIS: 11, CHA: 13, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "4d6", DamageBonus: 0, AvgDamage: 14, DamageType: "fire"}}},
+		"brown_bear":                {Slug: "brown_bear", Name: "Brown Bear", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 34, AC: 11, SpeedWalk: 40, STR: 19, DEX: 10, CON: 16, INT: 2, WIS: 13, CHA: 7, Multiattack: "The bear makes two attacks: one with its bite and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}}, Traits: []string{"Keen Smell"}},
+		"bugbear":                   {Slug: "bugbear", Name: "Bugbear", Size: "medium", Type: "humanoid", CR: 1, XP: 200, HP: 27, AC: 16, SpeedWalk: 30, STR: 15, DEX: 14, CON: 13, INT: 8, WIS: 11, CHA: 9, Attacks: []SRDStatAttack{{Name: "Morningstar", AttackBonus: 4, DamageDice: "2d8", DamageBonus: 2, AvgDamage: 11, DamageType: "piercing"}, {Name: "Javelin", AttackBonus: 4, DamageDice: "2d6", DamageBonus: 2, AvgDamage: 9, DamageType: "piercing"}}, Traits: []string{"Brute", "Surprise Attack"}},
+		"copper_dragon_wyrmling":    {Slug: "copper_dragon_wyrmling", Name: "Copper Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 1, XP: 200, HP: 22, AC: 16, SpeedWalk: 30, STR: 15, DEX: 12, CON: 13, INT: 14, WIS: 11, CHA: 13, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "4d8", DamageBonus: 0, AvgDamage: 18, DamageType: "acid"}}},
+		"death_dog":                 {Slug: "death_dog", Name: "Death Dog", Size: "medium", Type: "monstrosity", CR: 1, XP: 200, HP: 39, AC: 12, SpeedWalk: 40, STR: 15, DEX: 14, CON: 14, INT: 3, WIS: 13, CHA: 6, Multiattack: "The dog makes two bite attacks.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Two-Headed"}},
+		"dire_wolf":                 {Slug: "dire_wolf", Name: "Dire Wolf", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 37, AC: 14, SpeedWalk: 50, STR: 17, DEX: 15, CON: 15, INT: 3, WIS: 12, CHA: 7, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Keen Hearing and Smell", "Pack Tactics"}},
+		"dryad":                     {Slug: "dryad", Name: "Dryad", Size: "medium", Type: "fey", CR: 1, XP: 200, HP: 22, AC: 11, SpeedWalk: 30, STR: 10, DEX: 12, CON: 11, INT: 14, WIS: 15, CHA: 18, Attacks: []SRDStatAttack{{Name: "Club", AttackBonus: 2, DamageDice: "1d4", DamageBonus: 0, AvgDamage: 2, DamageType: "bludgeoning"}}, Traits: []string{"Innate Spellcasting", "Magic Resistance", "Speak with Beasts and Plants", "Tree Stride"}},
+		"duergar":                   {Slug: "duergar", Name: "Duergar", Size: "medium", Type: "humanoid", CR: 1, XP: 200, HP: 26, AC: 16, SpeedWalk: 25, STR: 14, DEX: 11, CON: 14, INT: 11, WIS: 10, CHA: 9, Attacks: []SRDStatAttack{{Name: "War Pick", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}, {Name: "Javelin", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Duergar Resilience", "Sunlight Sensitivity"}},
+		"ghoul":                     {Slug: "ghoul", Name: "Ghoul", Size: "medium", Type: "undead", CR: 1, XP: 200, HP: 22, AC: 12, SpeedWalk: 30, STR: 13, DEX: 15, CON: 10, INT: 7, WIS: 10, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 2, DamageDice: "2d6", DamageBonus: 2, AvgDamage: 9, DamageType: "piercing"}}},
+		"giant_eagle":               {Slug: "giant_eagle", Name: "Giant Eagle", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 26, AC: 13, SpeedWalk: 10, STR: 16, DEX: 17, CON: 13, INT: 8, WIS: 14, CHA: 10, Multiattack: "The eagle makes two attacks: one with its beak and one with its talons.", Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}, {Name: "Talons", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "slashing"}}, Traits: []string{"Keen Sight"}},
+		"giant_hyena":               {Slug: "giant_hyena", Name: "Giant Hyena", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 45, AC: 12, SpeedWalk: 50, STR: 16, DEX: 14, CON: 14, INT: 2, WIS: 12, CHA: 7, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Rampage"}},
+		"giant_octopus":             {Slug: "giant_octopus", Name: "Giant Octopus", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 52, AC: 11, SpeedWalk: 10, STR: 17, DEX: 13, CON: 13, INT: 4, WIS: 10, CHA: 4, Attacks: []SRDStatAttack{{Name: "Tentacles", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "bludgeoning"}}, Traits: []string{"Hold Breath", "Underwater Camouflage", "Water Breathing"}},
+		"giant_spider":              {Slug: "giant_spider", Name: "Giant Spider", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 26, AC: 14, SpeedWalk: 30, STR: 14, DEX: 16, CON: 12, INT: 2, WIS: 11, CHA: 4, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Spider Climb", "Web Sense", "Web Walker"}},
+		"giant_toad":                {Slug: "giant_toad", Name: "Giant Toad", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 39, AC: 11, SpeedWalk: 20, STR: 15, DEX: 13, CON: 13, INT: 2, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Amphibious", "Standing Leap"}},
+		"giant_vulture":             {Slug: "giant_vulture", Name: "Giant Vulture", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 22, AC: 10, SpeedWalk: 10, STR: 15, DEX: 10, CON: 15, INT: 6, WIS: 12, CHA: 7, Multiattack: "The vulture makes two attacks: one with its beak and one with its talons.", Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 4, DamageDice: "2d4", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}, {Name: "Talons", AttackBonus: 4, DamageDice: "2d6", DamageBonus: 2, AvgDamage: 9, DamageType: "slashing"}}, Traits: []string{"Keen Sight and Smell", "Pack Tactics"}},
+		"harpy":                     {Slug: "harpy", Name: "Harpy", Size: "medium", Type: "monstrosity", CR: 1, XP: 200, HP: 38, AC: 11, SpeedWalk: 20, STR: 12, DEX: 13, CON: 12, INT: 7, WIS: 10, CHA: 13, Multiattack: "The harpy makes two attacks: one with its claws and one with its club.", Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 3, DamageDice: "2d4", DamageBonus: 1, AvgDamage: 6, DamageType: "slashing"}, {Name: "Club", AttackBonus: 3, DamageDice: "1d4", DamageBonus: 1, AvgDamage: 3, DamageType: "bludgeoning"}}},
+		"hippogriff":                {Slug: "hippogriff", Name: "Hippogriff", Size: "large", Type: "monstrosity", CR: 1, XP: 200, HP: 19, AC: 11, SpeedWalk: 40, STR: 17, DEX: 13, CON: 13, INT: 2, WIS: 12, CHA: 8, Multiattack: "The hippogriff makes two attacks: one with its beak and one with its claws.", Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 5, DamageDice: "1d10", DamageBonus: 3, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "slashing"}}, Traits: []string{"Keen Sight"}},
+		"imp":                       {Slug: "imp", Name: "Imp", Size: "tiny", Type: "fiend", CR: 1, XP: 200, HP: 10, AC: 13, SpeedWalk: 20, STR: 6, DEX: 17, CON: 13, INT: 11, WIS: 12, CHA: 14, Attacks: []SRDStatAttack{{Name: "Sting (Bite in Beast Form)", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 3, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Shapechanger", "Devil's Sight", "Magic Resistance", "Variant: Familiar"}},
+		"lion":                      {Slug: "lion", Name: "Lion", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 26, AC: 12, SpeedWalk: 50, STR: 17, DEX: 15, CON: 13, INT: 3, WIS: 12, CHA: 8, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "slashing"}}, Traits: []string{"Keen Smell", "Pack Tactics", "Pounce", "Running Leap"}},
+		"quasit":                    {Slug: "quasit", Name: "Quasit", Size: "tiny", Type: "fiend", CR: 1, XP: 200, HP: 7, AC: 13, SpeedWalk: 40, STR: 5, DEX: 17, CON: 10, INT: 7, WIS: 10, CHA: 10, Attacks: []SRDStatAttack{{Name: "Claw (Bite in Beast Form)", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 3, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Shapechanger", "Magic Resistance", "Variant: Familiar"}},
+		"specter":                   {Slug: "specter", Name: "Specter", Size: "medium", Type: "undead", CR: 1, XP: 200, HP: 22, AC: 12, SpeedWalk: 50, STR: 1, DEX: 14, CON: 11, INT: 10, WIS: 10, CHA: 11, Attacks: []SRDStatAttack{{Name: "Life Drain", AttackBonus: 4, DamageDice: "3d6", DamageBonus: 0, AvgDamage: 10, DamageType: "necrotic"}}, Traits: []string{"Incorporeal Movement", "Sunlight Sensitivity"}},
+		"spy":                       {Slug: "spy", Name: "Spy", Size: "medium", Type: "humanoid", CR: 1, XP: 200, HP: 27, AC: 12, SpeedWalk: 30, STR: 10, DEX: 15, CON: 10, INT: 12, WIS: 14, CHA: 16, Multiattack: "The spy makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Shortsword", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Hand Crossbow", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Cunning Action", "Sneak Attack (1/Turn)"}},
+		"swarm_of_quippers":         {Slug: "swarm_of_quippers", Name: "Swarm of Quippers", Size: "medium", Type: "beast", CR: 1, XP: 200, HP: 28, AC: 13, SpeedWalk: 40, STR: 13, DEX: 16, CON: 9, INT: 1, WIS: 7, CHA: 2, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 5, DamageDice: "4d6", DamageBonus: 0, AvgDamage: 14, DamageType: "piercing"}}, Traits: []string{"Blood Frenzy", "Swarm", "Water Breathing"}},
+		"tiger":                     {Slug: "tiger", Name: "Tiger", Size: "large", Type: "beast", CR: 1, XP: 200, HP: 37, AC: 12, SpeedWalk: 40, STR: 17, DEX: 15, CON: 14, INT: 3, WIS: 12, CHA: 8, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d10", DamageBonus: 3, AvgDamage: 8, DamageType: "piercing"}}, Traits: []string{"Keen Smell", "Pounce"}},
+		"ankheg":                    {Slug: "ankheg", Name: "Ankheg", Size: "large", Type: "monstrosity", CR: 2, XP: 450, HP: 39, AC: 14, SpeedWalk: 30, STR: 17, DEX: 11, CON: 13, INT: 1, WIS: 13, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "2d6+1d6", DamageBonus: 3, AvgDamage: 3, DamageType: "slashing"}, {Name: "Acid Spray (Recharge 6)", AttackBonus: 0, DamageDice: "3d6", DamageBonus: 0, AvgDamage: 10, DamageType: "acid"}}},
+		"awakened_tree":             {Slug: "awakened_tree", Name: "Awakened Tree", Size: "huge", Type: "plant", CR: 2, XP: 450, HP: 59, AC: 13, SpeedWalk: 20, STR: 19, DEX: 6, CON: 15, INT: 10, WIS: 10, CHA: 7, Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 6, DamageDice: "3d6", DamageBonus: 4, AvgDamage: 14, DamageType: "bludgeoning"}}, Traits: []string{"False Appearance"}},
+		"azer":                      {Slug: "azer", Name: "Azer", Size: "medium", Type: "elemental", CR: 2, XP: 450, HP: 39, AC: 17, SpeedWalk: 30, STR: 17, DEX: 12, CON: 15, INT: 12, WIS: 13, CHA: 10, Attacks: []SRDStatAttack{{Name: "Warhammer", AttackBonus: 5, DamageDice: "1d8+1d6", DamageBonus: 3, AvgDamage: 3, DamageType: "bludgeoning"}}, Traits: []string{"Heated Body", "Heated Weapons", "Illumination"}},
+		"bandit_captain":            {Slug: "bandit_captain", Name: "Bandit Captain", Size: "medium", Type: "humanoid", CR: 2, XP: 450, HP: 65, AC: 15, SpeedWalk: 30, STR: 15, DEX: 16, CON: 14, INT: 14, WIS: 11, CHA: 14, Multiattack: "The captain makes three melee attacks: two with its scimitar and one with its dagger.", Attacks: []SRDStatAttack{{Name: "Scimitar", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "slashing"}, {Name: "Dagger", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 3, AvgDamage: 5, DamageType: "piercing"}}},
+		"berserker":                 {Slug: "berserker", Name: "Berserker", Size: "medium", Type: "humanoid", CR: 2, XP: 450, HP: 67, AC: 13, SpeedWalk: 30, STR: 16, DEX: 12, CON: 17, INT: 9, WIS: 11, CHA: 9, Attacks: []SRDStatAttack{{Name: "Greataxe", AttackBonus: 5, DamageDice: "1d12", DamageBonus: 3, AvgDamage: 9, DamageType: "slashing"}}, Traits: []string{"Reckless"}},
+		"black_dragon_wyrmling":     {Slug: "black_dragon_wyrmling", Name: "Black Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 2, XP: 450, HP: 33, AC: 17, SpeedWalk: 30, STR: 15, DEX: 14, CON: 13, INT: 10, WIS: 11, CHA: 13, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}, {Name: "Acid Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "5d8", DamageBonus: 0, AvgDamage: 22, DamageType: "acid"}}, Traits: []string{"Amphibious"}},
+		"bronze_dragon_wyrmling":    {Slug: "bronze_dragon_wyrmling", Name: "Bronze Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 2, XP: 450, HP: 32, AC: 17, SpeedWalk: 30, STR: 17, DEX: 10, CON: 15, INT: 12, WIS: 11, CHA: 15, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d10", DamageBonus: 3, AvgDamage: 8, DamageType: "piercing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "3d10", DamageBonus: 0, AvgDamage: 16, DamageType: "lightning"}}, Traits: []string{"Amphibious"}},
+		"centaur":                   {Slug: "centaur", Name: "Centaur", Size: "large", Type: "monstrosity", CR: 2, XP: 450, HP: 45, AC: 12, SpeedWalk: 50, STR: 18, DEX: 14, CON: 14, INT: 9, WIS: 13, CHA: 11, Multiattack: "The centaur makes two attacks: one with its pike and one with its hooves or two with its longbow.", Attacks: []SRDStatAttack{{Name: "Pike", AttackBonus: 6, DamageDice: "1d10", DamageBonus: 4, AvgDamage: 9, DamageType: "piercing"}, {Name: "Hooves", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}, {Name: "Longbow", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Charge"}},
+		"cult_fanatic":              {Slug: "cult_fanatic", Name: "Cult Fanatic", Size: "medium", Type: "humanoid", CR: 2, XP: 450, HP: 22, AC: 13, SpeedWalk: 30, STR: 11, DEX: 14, CON: 12, INT: 10, WIS: 13, CHA: 14, Multiattack: "The fanatic makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Dagger", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Dark Devotion", "Spellcasting"}},
+		"druid":                     {Slug: "druid", Name: "Druid", Size: "medium", Type: "humanoid", CR: 2, XP: 450, HP: 27, AC: 11, SpeedWalk: 30, STR: 10, DEX: 12, CON: 13, INT: 12, WIS: 15, CHA: 11, Attacks: []SRDStatAttack{{Name: "Quarterstaff", AttackBonus: 2, DamageDice: "1d6", DamageBonus: 0, AvgDamage: 3, DamageType: "bludgeoning"}}, Traits: []string{"Spellcasting"}},
+		"ettercap":                  {Slug: "ettercap", Name: "Ettercap", Size: "medium", Type: "monstrosity", CR: 2, XP: 450, HP: 44, AC: 13, SpeedWalk: 30, STR: 14, DEX: 15, CON: 13, INT: 7, WIS: 12, CHA: 8, Multiattack: "The ettercap makes two attacks: one with its bite and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 4, DamageDice: "2d4", DamageBonus: 2, AvgDamage: 7, DamageType: "slashing"}, {Name: "Variant: Web Garrote", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Spider Climb", "Web Sense", "Web Walker"}},
+		"gargoyle":                  {Slug: "gargoyle", Name: "Gargoyle", Size: "medium", Type: "elemental", CR: 2, XP: 450, HP: 52, AC: 15, SpeedWalk: 30, STR: 15, DEX: 11, CON: 16, INT: 6, WIS: 11, CHA: 7, Multiattack: "The gargoyle makes two attacks: one with its bite and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "slashing"}}, Traits: []string{"False Appearance"}},
+		"gelatinous_cube":           {Slug: "gelatinous_cube", Name: "Gelatinous Cube", Size: "large", Type: "ooze", CR: 2, XP: 450, HP: 84, AC: 6, SpeedWalk: 15, STR: 14, DEX: 3, CON: 20, INT: 1, WIS: 6, CHA: 1, Attacks: []SRDStatAttack{{Name: "Pseudopod", AttackBonus: 4, DamageDice: "3d6", DamageBonus: 0, AvgDamage: 10, DamageType: "acid"}}, Traits: []string{"Ooze Cube", "Transparent"}},
+		"ghast":                     {Slug: "ghast", Name: "Ghast", Size: "medium", Type: "undead", CR: 2, XP: 450, HP: 36, AC: 13, SpeedWalk: 30, STR: 16, DEX: 17, CON: 10, INT: 11, WIS: 10, CHA: 8, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 3, DamageDice: "2d8", DamageBonus: 3, AvgDamage: 12, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "slashing"}}, Traits: []string{"Stench", "Turn Defiance"}},
+		"giant_boar":                {Slug: "giant_boar", Name: "Giant Boar", Size: "large", Type: "beast", CR: 2, XP: 450, HP: 42, AC: 12, SpeedWalk: 40, STR: 17, DEX: 10, CON: 16, INT: 2, WIS: 7, CHA: 5, Attacks: []SRDStatAttack{{Name: "Tusk", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "slashing"}}, Traits: []string{"Charge", "Relentless (Recharges after a Short or Long Rest)"}},
+		"giant_constrictor_snake":   {Slug: "giant_constrictor_snake", Name: "Giant Constrictor Snake", Size: "huge", Type: "beast", CR: 2, XP: 450, HP: 60, AC: 12, SpeedWalk: 30, STR: 19, DEX: 14, CON: 12, INT: 1, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}, {Name: "Constrict", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "bludgeoning"}}},
+		"giant_elk":                 {Slug: "giant_elk", Name: "Giant Elk", Size: "huge", Type: "beast", CR: 2, XP: 450, HP: 42, AC: 15, SpeedWalk: 60, STR: 19, DEX: 16, CON: 14, INT: 7, WIS: 14, CHA: 10, Attacks: []SRDStatAttack{{Name: "Ram", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}, {Name: "Hooves", AttackBonus: 6, DamageDice: "4d8", DamageBonus: 4, AvgDamage: 22, DamageType: "bludgeoning"}}, Traits: []string{"Charge"}},
+		"gibbering_mouther":         {Slug: "gibbering_mouther", Name: "Gibbering Mouther", Size: "medium", Type: "aberration", CR: 2, XP: 450, HP: 67, AC: 9, SpeedWalk: 10, STR: 10, DEX: 8, CON: 16, INT: 3, WIS: 10, CHA: 6, Multiattack: "The gibbering mouther makes one bite attack and, if it can, uses its Blinding Spittle.", Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 2, DamageDice: "5d6", DamageBonus: 0, AvgDamage: 17, DamageType: "piercing"}}, Traits: []string{"Aberrant Ground", "Gibbering"}},
+		"green_dragon_wyrmling":     {Slug: "green_dragon_wyrmling", Name: "Green Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 2, XP: 450, HP: 38, AC: 17, SpeedWalk: 30, STR: 15, DEX: 12, CON: 13, INT: 14, WIS: 11, CHA: 13, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10+1d6", DamageBonus: 3, AvgDamage: 3, DamageType: "piercing"}, {Name: "Poison Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "6d6", DamageBonus: 0, AvgDamage: 21, DamageType: "poison"}}, Traits: []string{"Amphibious"}},
+		"grick":                     {Slug: "grick", Name: "Grick", Size: "medium", Type: "monstrosity", CR: 2, XP: 450, HP: 27, AC: 14, SpeedWalk: 30, STR: 14, DEX: 14, CON: 11, INT: 3, WIS: 14, CHA: 5, Multiattack: "The grick makes one attack with its tentacles.", Attacks: []SRDStatAttack{{Name: "Tentacles", AttackBonus: 4, DamageDice: "2d6", DamageBonus: 2, AvgDamage: 9, DamageType: "slashing"}, {Name: "Beak", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Stone Camouflage"}},
+		"griffon":                   {Slug: "griffon", Name: "Griffon", Size: "large", Type: "monstrosity", CR: 2, XP: 450, HP: 59, AC: 12, SpeedWalk: 30, STR: 18, DEX: 15, CON: 16, INT: 2, WIS: 13, CHA: 8, Multiattack: "The griffon makes two attacks: one with its beak and one with its claws.", Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 6, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}}, Traits: []string{"Keen Sight"}},
+		"hunter_shark":              {Slug: "hunter_shark", Name: "Hunter Shark", Size: "large", Type: "beast", CR: 2, XP: 450, HP: 45, AC: 12, SpeedWalk: 40, STR: 18, DEX: 13, CON: 15, INT: 1, WIS: 10, CHA: 4, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "piercing"}}, Traits: []string{"Blood Frenzy", "Water Breathing"}},
+		"merrow":                    {Slug: "merrow", Name: "Merrow", Size: "large", Type: "monstrosity", CR: 2, XP: 450, HP: 45, AC: 13, SpeedWalk: 10, STR: 18, DEX: 10, CON: 15, INT: 8, WIS: 10, CHA: 9, Multiattack: "The merrow makes two attacks: one with its bite and one with its claws or harpoon.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 6, DamageDice: "2d4", DamageBonus: 4, AvgDamage: 9, DamageType: "slashing"}, {Name: "Harpoon", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}}, Traits: []string{"Amphibious"}},
+		"mimic":                     {Slug: "mimic", Name: "Mimic", Size: "medium", Type: "monstrosity", CR: 2, XP: 450, HP: 58, AC: 12, SpeedWalk: 15, STR: 17, DEX: 12, CON: 15, INT: 5, WIS: 13, CHA: 8, Attacks: []SRDStatAttack{{Name: "Pseudopod", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "bludgeoning"}, {Name: "Bite", AttackBonus: 5, DamageDice: "1d8+1d8", DamageBonus: 3, AvgDamage: 3, DamageType: "piercing"}}, Traits: []string{"Shapechanger", "Adhesive (Object Form Only)", "False Appearance (Object Form Only)", "Grappler"}},
+		"minotaur_skeleton":         {Slug: "minotaur_skeleton", Name: "Minotaur Skeleton", Size: "large", Type: "undead", CR: 2, XP: 450, HP: 67, AC: 12, SpeedWalk: 40, STR: 18, DEX: 11, CON: 15, INT: 6, WIS: 8, CHA: 5, Attacks: []SRDStatAttack{{Name: "Greataxe", AttackBonus: 6, DamageDice: "2d12", DamageBonus: 4, AvgDamage: 17, DamageType: "slashing"}, {Name: "Gore", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "piercing"}}, Traits: []string{"Charge"}},
+		"ochre_jelly":               {Slug: "ochre_jelly", Name: "Ochre Jelly", Size: "large", Type: "ooze", CR: 2, XP: 450, HP: 45, AC: 8, SpeedWalk: 10, STR: 15, DEX: 6, CON: 14, INT: 2, WIS: 6, CHA: 1, Attacks: []SRDStatAttack{{Name: "Pseudopod", AttackBonus: 4, DamageDice: "2d6", DamageBonus: 2, AvgDamage: 9, DamageType: "bludgeoning"}}, Traits: []string{"Amorphous", "Spider Climb"}},
+		"ogre":                      {Slug: "ogre", Name: "Ogre", Size: "large", Type: "giant", CR: 2, XP: 450, HP: 59, AC: 11, SpeedWalk: 40, STR: 19, DEX: 8, CON: 16, INT: 5, WIS: 7, CHA: 7, Attacks: []SRDStatAttack{{Name: "Greatclub", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "bludgeoning"}, {Name: "Javelin", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}}},
+		"ogre_zombie":               {Slug: "ogre_zombie", Name: "Ogre Zombie", Size: "large", Type: "undead", CR: 2, XP: 450, HP: 85, AC: 8, SpeedWalk: 30, STR: 19, DEX: 6, CON: 18, INT: 3, WIS: 6, CHA: 5, Attacks: []SRDStatAttack{{Name: "Morningstar", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "bludgeoning"}}, Traits: []string{"Undead Fortitude"}},
+		"pegasus":                   {Slug: "pegasus", Name: "Pegasus", Size: "large", Type: "celestial", CR: 2, XP: 450, HP: 59, AC: 12, SpeedWalk: 60, STR: 18, DEX: 15, CON: 16, INT: 10, WIS: 15, CHA: 13, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}}},
+		"plesiosaurus":              {Slug: "plesiosaurus", Name: "Plesiosaurus", Size: "large", Type: "beast", CR: 2, XP: 450, HP: 68, AC: 13, SpeedWalk: 20, STR: 18, DEX: 15, CON: 16, INT: 2, WIS: 12, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "3d6", DamageBonus: 4, AvgDamage: 14, DamageType: "piercing"}}, Traits: []string{"Hold Breath"}},
+		"polar_bear":                {Slug: "polar_bear", Name: "Polar Bear", Size: "large", Type: "beast", CR: 2, XP: 450, HP: 42, AC: 12, SpeedWalk: 40, STR: 20, DEX: 10, CON: 16, INT: 2, WIS: 13, CHA: 7, Multiattack: "The bear makes two attacks: one with its bite and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "1d8", DamageBonus: 5, AvgDamage: 9, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 5, AvgDamage: 12, DamageType: "slashing"}}, Traits: []string{"Keen Smell"}},
+		"priest":                    {Slug: "priest", Name: "Priest", Size: "medium", Type: "humanoid", CR: 2, XP: 450, HP: 27, AC: 13, SpeedWalk: 25, STR: 10, DEX: 10, CON: 12, INT: 13, WIS: 16, CHA: 13, Attacks: []SRDStatAttack{{Name: "Mace", AttackBonus: 2, DamageDice: "1d6", DamageBonus: 0, AvgDamage: 3, DamageType: "bludgeoning"}}, Traits: []string{"Divine Eminence", "Spellcasting"}},
+		"rhinoceros":                {Slug: "rhinoceros", Name: "Rhinoceros", Size: "large", Type: "beast", CR: 2, XP: 450, HP: 45, AC: 11, SpeedWalk: 40, STR: 21, DEX: 8, CON: 15, INT: 2, WIS: 12, CHA: 6, Attacks: []SRDStatAttack{{Name: "Gore", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 5, AvgDamage: 14, DamageType: "bludgeoning"}}, Traits: []string{"Charge"}},
+		"rug_of_smothering":         {Slug: "rug_of_smothering", Name: "Rug of Smothering", Size: "large", Type: "construct", CR: 2, XP: 450, HP: 33, AC: 12, SpeedWalk: 10, STR: 17, DEX: 14, CON: 10, INT: 1, WIS: 3, CHA: 1, Attacks: []SRDStatAttack{{Name: "Smother", AttackBonus: 0, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "bludgeoning"}}, Traits: []string{"Antimagic Susceptibility", "Damage Transfer", "False Appearance"}},
+		"saber_toothed_tiger":       {Slug: "saber_toothed_tiger", Name: "Saber-Toothed Tiger", Size: "large", Type: "beast", CR: 2, XP: 450, HP: 52, AC: 12, SpeedWalk: 40, STR: 18, DEX: 14, CON: 15, INT: 3, WIS: 12, CHA: 8, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "1d10", DamageBonus: 5, AvgDamage: 10, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 5, AvgDamage: 12, DamageType: "slashing"}}, Traits: []string{"Keen Smell", "Pounce"}},
+		"sea_hag":                   {Slug: "sea_hag", Name: "Sea Hag", Size: "medium", Type: "fey", CR: 2, XP: 450, HP: 52, AC: 14, SpeedWalk: 30, STR: 16, DEX: 13, CON: 16, INT: 12, WIS: 12, CHA: 13, Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "slashing"}}, Traits: []string{"Amphibious", "Horrific Appearance", "Hag Coven", "Shared Spellcasting (Coven Only)", "Hag Eye (Coven Only)"}},
+		"silver_dragon_wyrmling":    {Slug: "silver_dragon_wyrmling", Name: "Silver Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 2, XP: 450, HP: 45, AC: 17, SpeedWalk: 30, STR: 19, DEX: 10, CON: 17, INT: 12, WIS: 11, CHA: 15, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "1d10", DamageBonus: 4, AvgDamage: 9, DamageType: "piercing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "4d8", DamageBonus: 0, AvgDamage: 18, DamageType: "cold"}}},
+		"swarm_of_poisonous_snakes": {Slug: "swarm_of_poisonous_snakes", Name: "Swarm of Poisonous Snakes", Size: "medium", Type: "beast", CR: 2, XP: 450, HP: 36, AC: 14, SpeedWalk: 30, STR: 8, DEX: 18, CON: 11, INT: 1, WIS: 10, CHA: 3, Attacks: []SRDStatAttack{{Name: "Bites", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 0, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Swarm"}},
+		"wererat":                   {Slug: "wererat", Name: "Wererat", Size: "medium", Type: "humanoid", CR: 2, XP: 450, HP: 33, AC: 12, SpeedWalk: 30, STR: 10, DEX: 15, CON: 12, INT: 11, WIS: 10, CHA: 8, Attacks: []SRDStatAttack{{Name: "Bite (Rat or Hybrid Form Only).", AttackBonus: 4, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}, {Name: "Shortsword (Humanoid or Hybrid Form Only)", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Hand Crossbow (Humanoid or Hybrid Form Only)", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Shapechanger", "Keen Smell"}},
+		"white_dragon_wyrmling":     {Slug: "white_dragon_wyrmling", Name: "White Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 2, XP: 450, HP: 32, AC: 16, SpeedWalk: 30, STR: 14, DEX: 10, CON: 14, INT: 5, WIS: 10, CHA: 11, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10+1d4", DamageBonus: 2, AvgDamage: 2, DamageType: "piercing"}, {Name: "Cold Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "5d8", DamageBonus: 0, AvgDamage: 22, DamageType: "cold"}}},
+		"will_o_wisp":               {Slug: "will_o_wisp", Name: "Will-o'-Wisp", Size: "tiny", Type: "undead", CR: 2, XP: 450, HP: 22, AC: 19, SpeedWalk: 50, STR: 1, DEX: 28, CON: 10, INT: 13, WIS: 14, CHA: 11, Attacks: []SRDStatAttack{{Name: "Shock", AttackBonus: 4, DamageDice: "2d8", DamageBonus: 0, AvgDamage: 9, DamageType: "lightning"}}, Traits: []string{"Consume Life", "Ephemeral", "Incorporeal Movement", "Variable Illumination"}},
+		"basilisk":                  {Slug: "basilisk", Name: "Basilisk", Size: "medium", Type: "monstrosity", CR: 3, XP: 700, HP: 52, AC: 12, SpeedWalk: 20, STR: 16, DEX: 8, CON: 15, INT: 2, WIS: 8, CHA: 7, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "2d6+2d6", DamageBonus: 3, AvgDamage: 3, DamageType: "piercing"}}, Traits: []string{"Petrifying Gaze"}},
+		"bearded_devil":             {Slug: "bearded_devil", Name: "Bearded Devil", Size: "medium", Type: "fiend", CR: 3, XP: 700, HP: 52, AC: 13, SpeedWalk: 30, STR: 16, DEX: 15, CON: 15, INT: 9, WIS: 11, CHA: 11, Multiattack: "The devil makes two attacks: one with its beard and one with its glaive.", Attacks: []SRDStatAttack{{Name: "Beard", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}, {Name: "Glaive", AttackBonus: 5, DamageDice: "1d10", DamageBonus: 3, AvgDamage: 8, DamageType: "slashing"}}, Traits: []string{"Devil's Sight", "Magic Resistance", "Steadfast"}},
+		"blue_dragon_wyrmling":      {Slug: "blue_dragon_wyrmling", Name: "Blue Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 3, XP: 700, HP: 52, AC: 17, SpeedWalk: 30, STR: 17, DEX: 10, CON: 15, INT: 12, WIS: 11, CHA: 15, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d10+1d6", DamageBonus: 3, AvgDamage: 3, DamageType: "piercing"}, {Name: "Lightning Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "4d10", DamageBonus: 0, AvgDamage: 22, DamageType: "lightning"}}},
+		"doppelganger":              {Slug: "doppelganger", Name: "Doppelganger", Size: "medium", Type: "monstrosity", CR: 3, XP: 700, HP: 52, AC: 14, SpeedWalk: 30, STR: 11, DEX: 18, CON: 14, INT: 11, WIS: 12, CHA: 14, Multiattack: "The doppelganger makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 6, DamageDice: "1d6", DamageBonus: 4, AvgDamage: 7, DamageType: "bludgeoning"}}, Traits: []string{"Shapechanger", "Ambusher", "Surprise Attack"}},
+		"giant_scorpion":            {Slug: "giant_scorpion", Name: "Giant Scorpion", Size: "large", Type: "beast", CR: 3, XP: 700, HP: 52, AC: 15, SpeedWalk: 40, STR: 15, DEX: 13, CON: 15, INT: 1, WIS: 9, CHA: 3, Multiattack: "The scorpion makes three attacks: two with its claws and one with its sting.", Attacks: []SRDStatAttack{{Name: "Claw", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "bludgeoning"}, {Name: "Sting", AttackBonus: 4, DamageDice: "1d10", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}}},
+		"gold_dragon_wyrmling":      {Slug: "gold_dragon_wyrmling", Name: "Gold Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 3, XP: 700, HP: 60, AC: 17, SpeedWalk: 30, STR: 19, DEX: 14, CON: 17, INT: 14, WIS: 11, CHA: 16, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "1d10", DamageBonus: 4, AvgDamage: 9, DamageType: "piercing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "4d10", DamageBonus: 0, AvgDamage: 22, DamageType: "fire"}}, Traits: []string{"Amphibious"}},
+		"green_hag":                 {Slug: "green_hag", Name: "Green Hag", Size: "medium", Type: "fey", CR: 3, XP: 700, HP: 82, AC: 17, SpeedWalk: 30, STR: 18, DEX: 12, CON: 16, INT: 13, WIS: 14, CHA: 14, Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "slashing"}}, Traits: []string{"Amphibious", "Innate Spellcasting", "Mimicry", "Hag Coven", "Shared Spellcasting (Coven Only)", "Hag Eye (Coven Only)"}},
+		"hell_hound":                {Slug: "hell_hound", Name: "Hell Hound", Size: "medium", Type: "fiend", CR: 3, XP: 700, HP: 45, AC: 15, SpeedWalk: 50, STR: 17, DEX: 12, CON: 14, INT: 6, WIS: 13, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "piercing"}, {Name: "Fire Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "6d6", DamageBonus: 0, AvgDamage: 21, DamageType: "fire"}}, Traits: []string{"Keen Hearing and Smell", "Pack Tactics"}},
+		"killer_whale":              {Slug: "killer_whale", Name: "Killer Whale", Size: "huge", Type: "beast", CR: 3, XP: 700, HP: 90, AC: 12, SpeedWalk: 60, STR: 19, DEX: 10, CON: 13, INT: 3, WIS: 12, CHA: 7, Traits: []string{"Echolocation", "Hold Breath", "Keen Hearing"}},
+		"knight":                    {Slug: "knight", Name: "Knight", Size: "medium", Type: "humanoid", CR: 3, XP: 700, HP: 52, AC: 18, SpeedWalk: 30, STR: 16, DEX: 11, CON: 14, INT: 11, WIS: 11, CHA: 15, Multiattack: "The knight makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Greatsword", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "slashing"}, {Name: "Heavy Crossbow", AttackBonus: 2, DamageDice: "1d10", DamageBonus: 0, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Brave"}},
+		"manticore":                 {Slug: "manticore", Name: "Manticore", Size: "large", Type: "monstrosity", CR: 3, XP: 700, HP: 68, AC: 14, SpeedWalk: 30, STR: 17, DEX: 16, CON: 17, INT: 7, WIS: 12, CHA: 8, Multiattack: "The manticore makes three attacks: one with its bite and two with its claws or three with its tail spikes.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "slashing"}, {Name: "Tail Spike", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Tail Spike Regrowth"}},
+		"minotaur":                  {Slug: "minotaur", Name: "Minotaur", Size: "large", Type: "monstrosity", CR: 3, XP: 700, HP: 76, AC: 14, SpeedWalk: 40, STR: 18, DEX: 11, CON: 16, INT: 6, WIS: 16, CHA: 9, Attacks: []SRDStatAttack{{Name: "Greataxe", AttackBonus: 6, DamageDice: "2d12", DamageBonus: 4, AvgDamage: 17, DamageType: "slashing"}, {Name: "Gore", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "piercing"}}, Traits: []string{"Charge", "Labyrinthine Recall", "Reckless"}},
+		"mummy":                     {Slug: "mummy", Name: "Mummy", Size: "medium", Type: "undead", CR: 3, XP: 700, HP: 58, AC: 11, SpeedWalk: 20, STR: 16, DEX: 8, CON: 15, INT: 6, WIS: 10, CHA: 12, Multiattack: "The mummy can use its Dreadful Glare and makes one attack with its rotting fist.", Attacks: []SRDStatAttack{{Name: "Rotting Fist", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "bludgeoning"}}},
+		"nightmare":                 {Slug: "nightmare", Name: "Nightmare", Size: "large", Type: "fiend", CR: 3, XP: 700, HP: 68, AC: 13, SpeedWalk: 60, STR: 18, DEX: 15, CON: 16, INT: 10, WIS: 13, CHA: 15, Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 6, DamageDice: "2d8+2d6", DamageBonus: 4, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Confer Fire Resistance", "Illumination"}},
+		"owlbear":                   {Slug: "owlbear", Name: "Owlbear", Size: "large", Type: "monstrosity", CR: 3, XP: 700, HP: 59, AC: 13, SpeedWalk: 40, STR: 20, DEX: 12, CON: 17, INT: 3, WIS: 12, CHA: 7, Multiattack: "The owlbear makes two attacks: one with its beak and one with its claws.", Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 7, DamageDice: "1d10", DamageBonus: 5, AvgDamage: 10, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 5, AvgDamage: 14, DamageType: "slashing"}}, Traits: []string{"Keen Sight and Smell"}},
+		"phase_spider":              {Slug: "phase_spider", Name: "Phase Spider", Size: "large", Type: "monstrosity", CR: 3, XP: 700, HP: 32, AC: 13, SpeedWalk: 30, STR: 15, DEX: 15, CON: 12, INT: 6, WIS: 10, CHA: 6, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 4, DamageDice: "1d10", DamageBonus: 2, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Ethereal Jaunt", "Spider Climb", "Web Walker"}},
+		"veteran":                   {Slug: "veteran", Name: "Veteran", Size: "medium", Type: "humanoid", CR: 3, XP: 700, HP: 58, AC: 17, SpeedWalk: 30, STR: 16, DEX: 13, CON: 14, INT: 10, WIS: 11, CHA: 10, Multiattack: "The veteran makes two longsword attacks.", Attacks: []SRDStatAttack{{Name: "Longsword", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "slashing"}, {Name: "Shortsword", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}, {Name: "Heavy Crossbow", AttackBonus: 3, DamageDice: "1d10", DamageBonus: 1, AvgDamage: 6, DamageType: "piercing"}}},
+		"werewolf":                  {Slug: "werewolf", Name: "Werewolf", Size: "medium", Type: "humanoid", CR: 3, XP: 700, HP: 58, AC: 11, SpeedWalk: 30, STR: 15, DEX: 13, CON: 14, INT: 10, WIS: 11, CHA: 10, Attacks: []SRDStatAttack{{Name: "Bite (Wolf or Hybrid Form Only)", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}, {Name: "Claws (Hybrid Form Only)", AttackBonus: 4, DamageDice: "2d4", DamageBonus: 2, AvgDamage: 7, DamageType: "slashing"}, {Name: "Spear (Humanoid Form Only)", AttackBonus: 4, DamageDice: "1d6", DamageBonus: -2, AvgDamage: 1, DamageType: "piercing"}}, Traits: []string{"Shapechanger", "Keen Hearing and Smell"}},
+		"wight":                     {Slug: "wight", Name: "Wight", Size: "medium", Type: "undead", CR: 3, XP: 700, HP: 45, AC: 14, SpeedWalk: 30, STR: 15, DEX: 14, CON: 16, INT: 10, WIS: 13, CHA: 15, Multiattack: "The wight makes two longsword attacks or two longbow attacks.", Attacks: []SRDStatAttack{{Name: "Life Drain", AttackBonus: 4, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "necrotic"}, {Name: "Longsword", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "slashing"}, {Name: "Longbow", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Sunlight Sensitivity"}},
+		"winter_wolf":               {Slug: "winter_wolf", Name: "Winter Wolf", Size: "large", Type: "monstrosity", CR: 3, XP: 700, HP: 75, AC: 13, SpeedWalk: 50, STR: 18, DEX: 13, CON: 14, INT: 7, WIS: 12, CHA: 8, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}, {Name: "Cold Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "4d8", DamageBonus: 0, AvgDamage: 18, DamageType: "cold"}}, Traits: []string{"Keen Hearing and Smell", "Pack Tactics", "Snow Camouflage"}},
+		"black_pudding":             {Slug: "black_pudding", Name: "Black Pudding", Size: "large", Type: "ooze", CR: 4, XP: 1100, HP: 85, AC: 7, SpeedWalk: 20, STR: 16, DEX: 5, CON: 16, INT: 1, WIS: 6, CHA: 1, Attacks: []SRDStatAttack{{Name: "Pseudopod", AttackBonus: 5, DamageDice: "1d6+4d8", DamageBonus: 3, AvgDamage: 3, DamageType: "bludgeoning"}}, Traits: []string{"Amorphous", "Corrosive Form", "Spider Climb"}},
+		"chuul":                     {Slug: "chuul", Name: "Chuul", Size: "large", Type: "aberration", CR: 4, XP: 1100, HP: 93, AC: 16, SpeedWalk: 30, STR: 19, DEX: 10, CON: 16, INT: 5, WIS: 11, CHA: 5, Multiattack: "The chuul makes two pincer attacks.", Attacks: []SRDStatAttack{{Name: "Pincer", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}}, Traits: []string{"Amphibious", "Sense Magic"}},
+		"couatl":                    {Slug: "couatl", Name: "Couatl", Size: "medium", Type: "celestial", CR: 4, XP: 1100, HP: 97, AC: 19, SpeedWalk: 30, STR: 16, DEX: 20, CON: 17, INT: 18, WIS: 20, CHA: 18, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 8, DamageDice: "1d6", DamageBonus: 5, AvgDamage: 8, DamageType: "piercing"}, {Name: "Constrict", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "bludgeoning"}}, Traits: []string{"Innate Spellcasting", "Magic Weapons", "Shielded Mind"}},
+		"elephant":                  {Slug: "elephant", Name: "Elephant", Size: "huge", Type: "beast", CR: 4, XP: 1100, HP: 76, AC: 12, SpeedWalk: 40, STR: 22, DEX: 9, CON: 17, INT: 3, WIS: 11, CHA: 6, Attacks: []SRDStatAttack{{Name: "Gore", AttackBonus: 8, DamageDice: "3d8", DamageBonus: 6, AvgDamage: 19, DamageType: "piercing"}, {Name: "Stomp", AttackBonus: 8, DamageDice: "3d10", DamageBonus: 6, AvgDamage: 22, DamageType: "bludgeoning"}}, Traits: []string{"Trampling Charge"}},
+		"ettin":                     {Slug: "ettin", Name: "Ettin", Size: "large", Type: "giant", CR: 4, XP: 1100, HP: 85, AC: 12, SpeedWalk: 40, STR: 21, DEX: 8, CON: 17, INT: 6, WIS: 10, CHA: 8, Multiattack: "The ettin makes two attacks: one with its battleaxe and one with its morningstar.", Attacks: []SRDStatAttack{{Name: "Battleaxe", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 5, AvgDamage: 14, DamageType: "slashing"}, {Name: "Morningstar", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 5, AvgDamage: 14, DamageType: "piercing"}}, Traits: []string{"Two Heads", "Wakeful"}},
+		"ghost":                     {Slug: "ghost", Name: "Ghost", Size: "medium", Type: "undead", CR: 4, XP: 1100, HP: 45, AC: 11, SpeedWalk: 40, STR: 7, DEX: 13, CON: 10, INT: 10, WIS: 12, CHA: 17, Attacks: []SRDStatAttack{{Name: "Withering Touch", AttackBonus: 5, DamageDice: "4d6", DamageBonus: 3, AvgDamage: 17, DamageType: "necrotic"}}, Traits: []string{"Ethereal Sight", "Incorporeal Movement"}},
+		"lamia":                     {Slug: "lamia", Name: "Lamia", Size: "large", Type: "monstrosity", CR: 4, XP: 1100, HP: 97, AC: 13, SpeedWalk: 30, STR: 16, DEX: 13, CON: 15, INT: 14, WIS: 15, CHA: 16, Multiattack: "The lamia makes two attacks: one with its claws and one with its dagger or Intoxicating Touch.", Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 5, DamageDice: "2d10", DamageBonus: 3, AvgDamage: 14, DamageType: "slashing"}, {Name: "Dagger", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 3, AvgDamage: 5, DamageType: "piercing"}}, Traits: []string{"Innate Spellcasting"}},
+		"red_dragon_wyrmling":       {Slug: "red_dragon_wyrmling", Name: "Red Dragon Wyrmling", Size: "medium", Type: "dragon", CR: 4, XP: 1100, HP: 75, AC: 17, SpeedWalk: 30, STR: 19, DEX: 10, CON: 17, INT: 12, WIS: 11, CHA: 15, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "1d10+1d6", DamageBonus: 4, AvgDamage: 4, DamageType: "piercing"}, {Name: "Fire Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "7d6", DamageBonus: 0, AvgDamage: 24, DamageType: "fire"}}},
+		"succubusincubus":           {Slug: "succubusincubus", Name: "Succubus/Incubus", Size: "medium", Type: "fiend", CR: 4, XP: 1100, HP: 66, AC: 15, SpeedWalk: 30, STR: 8, DEX: 17, CON: 13, INT: 15, WIS: 12, CHA: 20, Attacks: []SRDStatAttack{{Name: "Claw (Fiend Form Only)", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "slashing"}, {Name: "Draining Kiss", AttackBonus: 0, DamageDice: "5d10", DamageBonus: 5, AvgDamage: 32, DamageType: "psychic"}}, Traits: []string{"Telepathic Bond", "Shapechanger"}},
+		"wereboar":                  {Slug: "wereboar", Name: "Wereboar", Size: "medium", Type: "humanoid", CR: 4, XP: 1100, HP: 78, AC: 10, SpeedWalk: 30, STR: 17, DEX: 10, CON: 15, INT: 10, WIS: 11, CHA: 8, Attacks: []SRDStatAttack{{Name: "Maul (Humanoid or Hybrid Form Only)", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "bludgeoning"}, {Name: "Tusks (Boar or Hybrid Form Only)", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "slashing"}}, Traits: []string{"Shapechanger", "Charge (Boar or Hybrid Form Only)", "Relentless (Recharges after a Short or Long Rest)"}},
+		"weretiger":                 {Slug: "weretiger", Name: "Weretiger", Size: "medium", Type: "humanoid", CR: 4, XP: 1100, HP: 120, AC: 12, SpeedWalk: 30, STR: 17, DEX: 15, CON: 16, INT: 10, WIS: 13, CHA: 11, Attacks: []SRDStatAttack{{Name: "Bite (Tiger or Hybrid Form Only)", AttackBonus: 5, DamageDice: "1d10", DamageBonus: 3, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claw (Tiger or Hybrid Form Only)", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "slashing"}, {Name: "Scimitar (Humanoid or Hybrid Form Only)", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "slashing"}, {Name: "Longbow (Humanoid or Hybrid Form Only)", AttackBonus: 4, DamageDice: "1d8", DamageBonus: 2, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Shapechanger", "Keen Hearing and Smell", "Pounce (Tiger or Hybrid Form Only)"}},
+		"air_elemental":             {Slug: "air_elemental", Name: "Air Elemental", Size: "large", Type: "elemental", CR: 5, XP: 1800, HP: 90, AC: 15, SpeedWalk: 90, STR: 14, DEX: 20, CON: 14, INT: 6, WIS: 10, CHA: 6, Multiattack: "The elemental makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 8, DamageDice: "2d8", DamageBonus: 5, AvgDamage: 14, DamageType: "bludgeoning"}}, Traits: []string{"Air Form"}},
+		"barbed_devil":              {Slug: "barbed_devil", Name: "Barbed Devil", Size: "medium", Type: "fiend", CR: 5, XP: 1800, HP: 110, AC: 15, SpeedWalk: 30, STR: 16, DEX: 17, CON: 18, INT: 12, WIS: 14, CHA: 14, Multiattack: "The devil makes three melee attacks: one with its tail and two with its claws.", Attacks: []SRDStatAttack{{Name: "Claw", AttackBonus: 6, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}, {Name: "Tail", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "piercing"}, {Name: "Hurl Flame", AttackBonus: 5, DamageDice: "3d6", DamageBonus: 0, AvgDamage: 10, DamageType: "fire"}}, Traits: []string{"Barbed Hide", "Devil's Sight", "Magic Resistance"}},
+		"bulette":                   {Slug: "bulette", Name: "Bulette", Size: "large", Type: "monstrosity", CR: 5, XP: 1800, HP: 94, AC: 17, SpeedWalk: 40, STR: 19, DEX: 11, CON: 21, INT: 2, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "4d12", DamageBonus: 4, AvgDamage: 30, DamageType: "piercing"}}, Traits: []string{"Standing Leap"}},
+		"earth_elemental":           {Slug: "earth_elemental", Name: "Earth Elemental", Size: "large", Type: "elemental", CR: 5, XP: 1800, HP: 126, AC: 17, SpeedWalk: 30, STR: 20, DEX: 8, CON: 20, INT: 5, WIS: 10, CHA: 5, Multiattack: "The elemental makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 8, DamageDice: "2d8", DamageBonus: 5, AvgDamage: 14, DamageType: "bludgeoning"}}, Traits: []string{"Earth Glide", "Siege Monster"}},
+		"fire_elemental":            {Slug: "fire_elemental", Name: "Fire Elemental", Size: "large", Type: "elemental", CR: 5, XP: 1800, HP: 102, AC: 13, SpeedWalk: 50, STR: 10, DEX: 17, CON: 16, INT: 6, WIS: 10, CHA: 7, Multiattack: "The elemental makes two touch attacks.", Attacks: []SRDStatAttack{{Name: "Touch", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "fire"}}, Traits: []string{"Fire Form", "Illumination", "Water Susceptibility"}},
+		"flesh_golem":               {Slug: "flesh_golem", Name: "Flesh Golem", Size: "medium", Type: "construct", CR: 5, XP: 1800, HP: 93, AC: 9, SpeedWalk: 30, STR: 19, DEX: 9, CON: 18, INT: 6, WIS: 10, CHA: 5, Multiattack: "The golem makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "bludgeoning"}}, Traits: []string{"Berserk", "Aversion of Fire", "Immutable Form", "Lightning Absorption", "Magic Resistance", "Magic Weapons"}},
+		"giant_crocodile":           {Slug: "giant_crocodile", Name: "Giant Crocodile", Size: "huge", Type: "beast", CR: 5, XP: 1800, HP: 85, AC: 14, SpeedWalk: 30, STR: 21, DEX: 9, CON: 17, INT: 2, WIS: 10, CHA: 7, Multiattack: "The crocodile makes two attacks: one with its bite and one with its tail.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 8, DamageDice: "3d10", DamageBonus: 5, AvgDamage: 21, DamageType: "piercing"}, {Name: "Tail", AttackBonus: 8, DamageDice: "2d8", DamageBonus: 5, AvgDamage: 14, DamageType: "bludgeoning"}}, Traits: []string{"Hold Breath"}},
+		"giant_shark":               {Slug: "giant_shark", Name: "Giant Shark", Size: "huge", Type: "beast", CR: 5, XP: 1800, HP: 126, AC: 13, SpeedWalk: 50, STR: 23, DEX: 11, CON: 21, INT: 1, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 9, DamageDice: "3d10", DamageBonus: 6, AvgDamage: 22, DamageType: "piercing"}}, Traits: []string{"Blood Frenzy", "Water Breathing"}},
+		"gladiator":                 {Slug: "gladiator", Name: "Gladiator", Size: "medium", Type: "humanoid", CR: 5, XP: 1800, HP: 112, AC: 16, SpeedWalk: 30, STR: 18, DEX: 15, CON: 16, INT: 10, WIS: 12, CHA: 15, Multiattack: "The gladiator makes three melee attacks or two ranged attacks.", Attacks: []SRDStatAttack{{Name: "Spear", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}, {Name: "Shield Bash", AttackBonus: 7, DamageDice: "2d4", DamageBonus: 4, AvgDamage: 9, DamageType: "bludgeoning"}}, Traits: []string{"Brave", "Brute"}},
+		"gorgon":                    {Slug: "gorgon", Name: "Gorgon", Size: "large", Type: "monstrosity", CR: 5, XP: 1800, HP: 114, AC: 19, SpeedWalk: 40, STR: 20, DEX: 11, CON: 18, INT: 2, WIS: 12, CHA: 7, Attacks: []SRDStatAttack{{Name: "Gore", AttackBonus: 8, DamageDice: "2d12", DamageBonus: 5, AvgDamage: 18, DamageType: "piercing"}, {Name: "Hooves", AttackBonus: 8, DamageDice: "2d10", DamageBonus: 5, AvgDamage: 16, DamageType: "bludgeoning"}}, Traits: []string{"Trampling Charge"}},
+		"half_red_dragon_veteran":   {Slug: "half_red_dragon_veteran", Name: "Half-Red Dragon Veteran", Size: "medium", Type: "humanoid", CR: 5, XP: 1800, HP: 65, AC: 18, SpeedWalk: 30, STR: 16, DEX: 13, CON: 14, INT: 10, WIS: 11, CHA: 10, Multiattack: "The veteran makes two longsword attacks.", Attacks: []SRDStatAttack{{Name: "Longsword", AttackBonus: 5, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "slashing"}, {Name: "Shortsword", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}, {Name: "Heavy Crossbow", AttackBonus: 3, DamageDice: "1d10", DamageBonus: 1, AvgDamage: 6, DamageType: "piercing"}, {Name: "Fire Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "7d6", DamageBonus: 0, AvgDamage: 24, DamageType: "fire"}}},
+		"hill_giant":                {Slug: "hill_giant", Name: "Hill Giant", Size: "huge", Type: "giant", CR: 5, XP: 1800, HP: 105, AC: 13, SpeedWalk: 40, STR: 21, DEX: 8, CON: 19, INT: 5, WIS: 9, CHA: 6, Multiattack: "The giant makes two greatclub attacks.", Attacks: []SRDStatAttack{{Name: "Greatclub", AttackBonus: 8, DamageDice: "3d8", DamageBonus: 5, AvgDamage: 18, DamageType: "bludgeoning"}, {Name: "Rock", AttackBonus: 8, DamageDice: "3d10", DamageBonus: 5, AvgDamage: 21, DamageType: "bludgeoning"}}},
+		"night_hag":                 {Slug: "night_hag", Name: "Night Hag", Size: "medium", Type: "fiend", CR: 5, XP: 1800, HP: 112, AC: 17, SpeedWalk: 30, STR: 18, DEX: 15, CON: 16, INT: 16, WIS: 14, CHA: 16, Attacks: []SRDStatAttack{{Name: "Claws (Hag Form Only)", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "slashing"}}, Traits: []string{"Innate Spellcasting", "Magic Resistance", "Night Hag Items", "Hag Coven", "Shared Spellcasting (Coven Only)", "Hag Eye (Coven Only)"}},
+		"otyugh":                    {Slug: "otyugh", Name: "Otyugh", Size: "large", Type: "aberration", CR: 5, XP: 1800, HP: 114, AC: 14, SpeedWalk: 30, STR: 16, DEX: 11, CON: 19, INT: 6, WIS: 13, CHA: 6, Multiattack: "The otyugh makes three attacks: one with its bite and two with its tentacles.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "2d8", DamageBonus: 3, AvgDamage: 12, DamageType: "piercing"}, {Name: "Tentacle", AttackBonus: 6, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "bludgeoning"}}, Traits: []string{"Limited Telepathy"}},
+		"roper":                     {Slug: "roper", Name: "Roper", Size: "large", Type: "monstrosity", CR: 5, XP: 1800, HP: 93, AC: 20, SpeedWalk: 10, STR: 18, DEX: 8, CON: 17, INT: 7, WIS: 16, CHA: 6, Multiattack: "The roper makes four attacks with its tendrils, uses Reel, and makes one attack with its bite.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "4d8", DamageBonus: 4, AvgDamage: 22, DamageType: "piercing"}}, Traits: []string{"False Appearance", "Grasping Tendrils", "Spider Climb"}},
+		"salamander":                {Slug: "salamander", Name: "Salamander", Size: "large", Type: "elemental", CR: 5, XP: 1800, HP: 90, AC: 15, SpeedWalk: 30, STR: 18, DEX: 14, CON: 15, INT: 11, WIS: 10, CHA: 12, Multiattack: "The salamander makes two attacks: one with its spear and one with its tail.", Attacks: []SRDStatAttack{{Name: "Spear", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}, {Name: "Tail", AttackBonus: 7, DamageDice: "2d6+2d6", DamageBonus: 4, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Heated Body", "Heated Weapons"}},
+		"shambling_mound":           {Slug: "shambling_mound", Name: "Shambling Mound", Size: "large", Type: "plant", CR: 5, XP: 1800, HP: 136, AC: 15, SpeedWalk: 20, STR: 18, DEX: 8, CON: 16, INT: 5, WIS: 10, CHA: 5, Multiattack: "The shambling mound makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "bludgeoning"}}, Traits: []string{"Lightning Absorption"}},
+		"triceratops":               {Slug: "triceratops", Name: "Triceratops", Size: "huge", Type: "beast", CR: 5, XP: 1800, HP: 95, AC: 13, SpeedWalk: 50, STR: 22, DEX: 9, CON: 17, INT: 2, WIS: 11, CHA: 5, Attacks: []SRDStatAttack{{Name: "Gore", AttackBonus: 9, DamageDice: "4d8", DamageBonus: 6, AvgDamage: 24, DamageType: "piercing"}, {Name: "Stomp", AttackBonus: 9, DamageDice: "3d10", DamageBonus: 6, AvgDamage: 22, DamageType: "bludgeoning"}}, Traits: []string{"Trampling Charge"}},
+		"troll":                     {Slug: "troll", Name: "Troll", Size: "large", Type: "giant", CR: 5, XP: 1800, HP: 84, AC: 15, SpeedWalk: 30, STR: 18, DEX: 13, CON: 20, INT: 7, WIS: 9, CHA: 7, Multiattack: "The troll makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "1d6", DamageBonus: 4, AvgDamage: 7, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}}, Traits: []string{"Keen Smell", "Regeneration", "Variant: Loathsome Limbs"}},
+		"unicorn":                   {Slug: "unicorn", Name: "Unicorn", Size: "large", Type: "celestial", CR: 5, XP: 1800, HP: 67, AC: 12, SpeedWalk: 50, STR: 18, DEX: 14, CON: 15, INT: 11, WIS: 17, CHA: 16, Multiattack: "The unicorn makes two attacks: one with its hooves and one with its horn.", Attacks: []SRDStatAttack{{Name: "Hooves", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}, {Name: "Horn", AttackBonus: 7, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "piercing"}}, Traits: []string{"Charge", "Innate Spellcasting", "Magic Resistance", "Magic Weapons"}, Legendary: true},
+		"vampire_spawn":             {Slug: "vampire_spawn", Name: "Vampire Spawn", Size: "medium", Type: "undead", CR: 5, XP: 1800, HP: 82, AC: 15, SpeedWalk: 30, STR: 16, DEX: 16, CON: 16, INT: 11, WIS: 10, CHA: 12, Multiattack: "The vampire makes two attacks, only one of which can be a bite attack.", Attacks: []SRDStatAttack{{Name: "Claws", AttackBonus: 6, DamageDice: "2d4", DamageBonus: 3, AvgDamage: 8, DamageType: "slashing"}}, Traits: []string{"Regeneration", "Spider Climb", "Vampire Weaknesses"}},
+		"water_elemental":           {Slug: "water_elemental", Name: "Water Elemental", Size: "large", Type: "elemental", CR: 5, XP: 1800, HP: 114, AC: 14, SpeedWalk: 30, STR: 18, DEX: 14, CON: 18, INT: 5, WIS: 10, CHA: 8, Multiattack: "The elemental makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "bludgeoning"}}, Traits: []string{"Water Form", "Freeze"}},
+		"werebear":                  {Slug: "werebear", Name: "Werebear", Size: "medium", Type: "humanoid", CR: 5, XP: 1800, HP: 135, AC: 10, SpeedWalk: 30, STR: 19, DEX: 10, CON: 17, INT: 11, WIS: 12, CHA: 12, Multiattack: "In bear form, the werebear makes two claw attacks.", Attacks: []SRDStatAttack{{Name: "Bite (Bear or Hybrid Form Only)", AttackBonus: 7, DamageDice: "2d10", DamageBonus: 4, AvgDamage: 15, DamageType: "piercing"}, {Name: "Claw (Bear or Hybrid Form Only)", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "slashing"}, {Name: "Greataxe (Humanoid or Hybrid Form Only)", AttackBonus: 7, DamageDice: "1d12", DamageBonus: 4, AvgDamage: 10, DamageType: "slashing"}}, Traits: []string{"Shapechanger", "Keen Smell"}},
+		"wraith":                    {Slug: "wraith", Name: "Wraith", Size: "medium", Type: "undead", CR: 5, XP: 1800, HP: 67, AC: 13, SpeedWalk: 60, STR: 6, DEX: 16, CON: 16, INT: 12, WIS: 14, CHA: 15, Attacks: []SRDStatAttack{{Name: "Life Drain", AttackBonus: 6, DamageDice: "4d8", DamageBonus: 3, AvgDamage: 21, DamageType: "necrotic"}}, Traits: []string{"Incorporeal Movement", "Sunlight Sensitivity"}},
+		"xorn":                      {Slug: "xorn", Name: "Xorn", Size: "medium", Type: "elemental", CR: 5, XP: 1800, HP: 73, AC: 19, SpeedWalk: 20, STR: 17, DEX: 10, CON: 22, INT: 11, WIS: 10, CHA: 11, Multiattack: "The xorn makes three claw attacks and one bite attack.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "3d6", DamageBonus: 3, AvgDamage: 13, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 6, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "slashing"}}, Traits: []string{"Earth Glide", "Stone Camouflage", "Treasure Sense"}},
+		"chimera":                   {Slug: "chimera", Name: "Chimera", Size: "large", Type: "monstrosity", CR: 6, XP: 2300, HP: 114, AC: 14, SpeedWalk: 30, STR: 19, DEX: 11, CON: 19, INT: 3, WIS: 14, CHA: 10, Multiattack: "The chimera makes three attacks: one with its bite, one with its horns, and one with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}, {Name: "Horns", AttackBonus: 7, DamageDice: "1d12", DamageBonus: 4, AvgDamage: 10, DamageType: "bludgeoning"}, {Name: "Claws", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}, {Name: "Fire Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "7d8", DamageBonus: 0, AvgDamage: 31, DamageType: "fire"}}},
+		"drider":                    {Slug: "drider", Name: "Drider", Size: "large", Type: "monstrosity", CR: 6, XP: 2300, HP: 123, AC: 19, SpeedWalk: 30, STR: 16, DEX: 16, CON: 18, INT: 13, WIS: 14, CHA: 12, Multiattack: "The drider makes three attacks, either with its longsword or its longbow.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}, {Name: "Longsword", AttackBonus: 6, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "slashing"}, {Name: "Longbow", AttackBonus: 6, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Fey Ancestry", "Innate Spellcasting", "Spider Climb", "Sunlight Sensitivity", "Web Walker"}},
+		"invisible_stalker":         {Slug: "invisible_stalker", Name: "Invisible Stalker", Size: "medium", Type: "elemental", CR: 6, XP: 2300, HP: 104, AC: 14, SpeedWalk: 50, STR: 16, DEX: 19, CON: 14, INT: 10, WIS: 15, CHA: 11, Multiattack: "The stalker makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "bludgeoning"}}, Traits: []string{"Invisibility", "Faultless Tracker"}},
+		"mage":                      {Slug: "mage", Name: "Mage", Size: "medium", Type: "humanoid", CR: 6, XP: 2300, HP: 40, AC: 12, SpeedWalk: 30, STR: 9, DEX: 14, CON: 11, INT: 17, WIS: 12, CHA: 11, Attacks: []SRDStatAttack{{Name: "Dagger", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Spellcasting"}},
+		"mammoth":                   {Slug: "mammoth", Name: "Mammoth", Size: "huge", Type: "beast", CR: 6, XP: 2300, HP: 126, AC: 13, SpeedWalk: 40, STR: 24, DEX: 9, CON: 21, INT: 3, WIS: 11, CHA: 6, Attacks: []SRDStatAttack{{Name: "Gore", AttackBonus: 10, DamageDice: "4d8", DamageBonus: 7, AvgDamage: 25, DamageType: "piercing"}, {Name: "Stomp", AttackBonus: 10, DamageDice: "4d10", DamageBonus: 7, AvgDamage: 29, DamageType: "bludgeoning"}}, Traits: []string{"Trampling Charge"}},
+		"medusa":                    {Slug: "medusa", Name: "Medusa", Size: "medium", Type: "monstrosity", CR: 6, XP: 2300, HP: 127, AC: 15, SpeedWalk: 30, STR: 10, DEX: 15, CON: 16, INT: 12, WIS: 13, CHA: 15, Multiattack: "The medusa makes either three melee attacks - one with its snake hair and two with its shortsword - or two ranged attacks with its longbow.", Attacks: []SRDStatAttack{{Name: "Snake Hair", AttackBonus: 5, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}, {Name: "Shortsword", AttackBonus: 5, DamageDice: "1d6", DamageBonus: 2, AvgDamage: 5, DamageType: "piercing"}, {Name: "Longbow", AttackBonus: 5, DamageDice: "2d6", DamageBonus: 0, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Petrifying Gaze"}},
+		"vrock":                     {Slug: "vrock", Name: "Vrock", Size: "large", Type: "fiend", CR: 6, XP: 2300, HP: 104, AC: 15, SpeedWalk: 40, STR: 17, DEX: 15, CON: 18, INT: 8, WIS: 13, CHA: 8, Multiattack: "The vrock makes two attacks: one with its beak and one with its talons.", Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "piercing"}, {Name: "Talons", AttackBonus: 6, DamageDice: "2d10", DamageBonus: 3, AvgDamage: 14, DamageType: "slashing"}}, Traits: []string{"Magic Resistance"}},
+		"wyvern":                    {Slug: "wyvern", Name: "Wyvern", Size: "large", Type: "dragon", CR: 6, XP: 2300, HP: 110, AC: 13, SpeedWalk: 20, STR: 19, DEX: 10, CON: 16, INT: 5, WIS: 12, CHA: 6, Multiattack: "The wyvern makes two attacks: one with its bite and one with its stinger.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 7, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "slashing"}, {Name: "Stinger", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "piercing"}}},
+		"young_brass_dragon":        {Slug: "young_brass_dragon", Name: "Young Brass Dragon", Size: "large", Type: "dragon", CR: 6, XP: 2300, HP: 110, AC: 17, SpeedWalk: 40, STR: 19, DEX: 10, CON: 17, INT: 12, WIS: 11, CHA: 15, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d10", DamageBonus: 4, AvgDamage: 15, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d6", DamageBonus: 0, AvgDamage: 42, DamageType: "fire"}}},
+		"young_white_dragon":        {Slug: "young_white_dragon", Name: "Young White Dragon", Size: "large", Type: "dragon", CR: 6, XP: 2300, HP: 133, AC: 17, SpeedWalk: 40, STR: 18, DEX: 10, CON: 18, INT: 6, WIS: 11, CHA: 12, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d10+1d8", DamageBonus: 4, AvgDamage: 4, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}, {Name: "Cold Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "10d8", DamageBonus: 0, AvgDamage: 45, DamageType: "cold"}}, Traits: []string{"Ice Walk"}},
+		"giant_ape":                 {Slug: "giant_ape", Name: "Giant Ape", Size: "huge", Type: "beast", CR: 7, XP: 2900, HP: 157, AC: 12, SpeedWalk: 40, STR: 23, DEX: 14, CON: 18, INT: 7, WIS: 12, CHA: 7, Multiattack: "The ape makes two fist attacks.", Attacks: []SRDStatAttack{{Name: "Fist", AttackBonus: 9, DamageDice: "3d10", DamageBonus: 6, AvgDamage: 22, DamageType: "bludgeoning"}, {Name: "Rock", AttackBonus: 9, DamageDice: "7d6", DamageBonus: 6, AvgDamage: 30, DamageType: "bludgeoning"}}},
+		"oni":                       {Slug: "oni", Name: "Oni", Size: "large", Type: "giant", CR: 7, XP: 2900, HP: 110, AC: 16, SpeedWalk: 30, STR: 19, DEX: 11, CON: 16, INT: 14, WIS: 12, CHA: 15, Multiattack: "The oni makes two attacks, either with its claws or its glaive.", Attacks: []SRDStatAttack{{Name: "Claw (Oni Form Only)", AttackBonus: 7, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "slashing"}, {Name: "Glaive", AttackBonus: 7, DamageDice: "2d10", DamageBonus: 4, AvgDamage: 15, DamageType: "slashing"}}, Traits: []string{"Innate Spellcasting", "Magic Weapons", "Regeneration"}},
+		"shield_guardian":           {Slug: "shield_guardian", Name: "Shield Guardian", Size: "large", Type: "construct", CR: 7, XP: 2900, HP: 142, AC: 17, SpeedWalk: 30, STR: 18, DEX: 8, CON: 18, INT: 7, WIS: 10, CHA: 3, Multiattack: "The guardian makes two fist attacks.", Attacks: []SRDStatAttack{{Name: "Fist", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "bludgeoning"}}, Traits: []string{"Bound", "Regeneration", "Spell Storing"}},
+		"stone_giant":               {Slug: "stone_giant", Name: "Stone Giant", Size: "huge", Type: "giant", CR: 7, XP: 2900, HP: 126, AC: 17, SpeedWalk: 40, STR: 23, DEX: 15, CON: 20, INT: 10, WIS: 12, CHA: 9, Multiattack: "The giant makes two greatclub attacks.", Attacks: []SRDStatAttack{{Name: "Greatclub", AttackBonus: 9, DamageDice: "3d8", DamageBonus: 6, AvgDamage: 19, DamageType: "bludgeoning"}, {Name: "Rock", AttackBonus: 9, DamageDice: "4d10", DamageBonus: 6, AvgDamage: 28, DamageType: "bludgeoning"}}, Traits: []string{"Stone Camouflage"}},
+		"young_black_dragon":        {Slug: "young_black_dragon", Name: "Young Black Dragon", Size: "large", Type: "dragon", CR: 7, XP: 2900, HP: 127, AC: 18, SpeedWalk: 40, STR: 19, DEX: 14, CON: 17, INT: 12, WIS: 11, CHA: 15, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d10+1d8", DamageBonus: 4, AvgDamage: 4, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}, {Name: "Acid Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "11d8", DamageBonus: 0, AvgDamage: 49, DamageType: "acid"}}, Traits: []string{"Amphibious"}},
+		"young_copper_dragon":       {Slug: "young_copper_dragon", Name: "Young Copper Dragon", Size: "large", Type: "dragon", CR: 7, XP: 2900, HP: 119, AC: 17, SpeedWalk: 40, STR: 19, DEX: 12, CON: 17, INT: 16, WIS: 13, CHA: 15, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d10", DamageBonus: 4, AvgDamage: 15, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "9d8", DamageBonus: 0, AvgDamage: 40, DamageType: "acid"}}},
+		"assassin":                  {Slug: "assassin", Name: "Assassin", Size: "medium", Type: "humanoid", CR: 8, XP: 3900, HP: 78, AC: 15, SpeedWalk: 30, STR: 11, DEX: 16, CON: 14, INT: 13, WIS: 11, CHA: 10, Multiattack: "The assassin makes two shortsword attacks.", Attacks: []SRDStatAttack{{Name: "Shortsword", AttackBonus: 6, DamageDice: "1d6", DamageBonus: 3, AvgDamage: 6, DamageType: "piercing"}, {Name: "Light Crossbow", AttackBonus: 6, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Assassinate", "Evasion", "Sneak Attack (1/Turn)"}},
+		"cloaker":                   {Slug: "cloaker", Name: "Cloaker", Size: "large", Type: "aberration", CR: 8, XP: 3900, HP: 78, AC: 14, SpeedWalk: 10, STR: 17, DEX: 15, CON: 12, INT: 13, WIS: 12, CHA: 14, Multiattack: "The cloaker makes two attacks: one with its bite and one with its tail.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 6, DamageDice: "2d6", DamageBonus: 3, AvgDamage: 10, DamageType: "piercing"}, {Name: "Tail", AttackBonus: 6, DamageDice: "1d8", DamageBonus: 3, AvgDamage: 7, DamageType: "slashing"}}, Traits: []string{"Damage Transfer", "False Appearance", "Light Sensitivity"}},
+		"frost_giant":               {Slug: "frost_giant", Name: "Frost Giant", Size: "huge", Type: "giant", CR: 8, XP: 3900, HP: 138, AC: 15, SpeedWalk: 40, STR: 23, DEX: 9, CON: 21, INT: 9, WIS: 10, CHA: 12, Multiattack: "The giant makes two greataxe attacks.", Attacks: []SRDStatAttack{{Name: "Greataxe", AttackBonus: 9, DamageDice: "3d12", DamageBonus: 6, AvgDamage: 25, DamageType: "slashing"}, {Name: "Rock", AttackBonus: 9, DamageDice: "4d10", DamageBonus: 6, AvgDamage: 28, DamageType: "bludgeoning"}}},
+		"hezrou":                    {Slug: "hezrou", Name: "Hezrou", Size: "large", Type: "fiend", CR: 8, XP: 3900, HP: 136, AC: 16, SpeedWalk: 30, STR: 19, DEX: 17, CON: 20, INT: 5, WIS: 12, CHA: 13, Multiattack: "The hezrou makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d10", DamageBonus: 4, AvgDamage: 15, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}}, Traits: []string{"Magic Resistance", "Stench"}},
+		"hydra":                     {Slug: "hydra", Name: "Hydra", Size: "huge", Type: "monstrosity", CR: 8, XP: 3900, HP: 172, AC: 15, SpeedWalk: 30, STR: 20, DEX: 12, CON: 20, INT: 2, WIS: 10, CHA: 7, Multiattack: "The hydra makes as many bite attacks as it has heads.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 8, DamageDice: "1d10", DamageBonus: 5, AvgDamage: 10, DamageType: "piercing"}}, Traits: []string{"Hold Breath", "Multiple Heads", "Reactive Heads", "Wakeful"}},
+		"spirit_naga":               {Slug: "spirit_naga", Name: "Spirit Naga", Size: "large", Type: "monstrosity", CR: 8, XP: 3900, HP: 75, AC: 15, SpeedWalk: 40, STR: 18, DEX: 17, CON: 14, INT: 16, WIS: 15, CHA: 16, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "1d6", DamageBonus: 4, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Rejuvenation", "Spellcasting"}},
+		"tyrannosaurus_rex":         {Slug: "tyrannosaurus_rex", Name: "Tyrannosaurus Rex", Size: "huge", Type: "beast", CR: 8, XP: 3900, HP: 136, AC: 13, SpeedWalk: 50, STR: 25, DEX: 10, CON: 19, INT: 2, WIS: 12, CHA: 9, Multiattack: "The tyrannosaurus makes two attacks: one with its bite and one with its tail.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 10, DamageDice: "4d12", DamageBonus: 7, AvgDamage: 33, DamageType: "piercing"}, {Name: "Tail", AttackBonus: 10, DamageDice: "3d8", DamageBonus: 7, AvgDamage: 20, DamageType: "bludgeoning"}}},
+		"young_bronze_dragon":       {Slug: "young_bronze_dragon", Name: "Young Bronze Dragon", Size: "large", Type: "dragon", CR: 8, XP: 3900, HP: 142, AC: 18, SpeedWalk: 40, STR: 21, DEX: 10, CON: 19, INT: 14, WIS: 13, CHA: 17, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 8, DamageDice: "2d10", DamageBonus: 5, AvgDamage: 16, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 8, DamageDice: "2d6", DamageBonus: 5, AvgDamage: 12, DamageType: "slashing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "10d10", DamageBonus: 0, AvgDamage: 55, DamageType: "lightning"}}, Traits: []string{"Amphibious"}},
+		"young_green_dragon":        {Slug: "young_green_dragon", Name: "Young Green Dragon", Size: "large", Type: "dragon", CR: 8, XP: 3900, HP: 136, AC: 18, SpeedWalk: 40, STR: 19, DEX: 12, CON: 17, INT: 16, WIS: 13, CHA: 15, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "2d10+2d6", DamageBonus: 4, AvgDamage: 4, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}, {Name: "Poison Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d6", DamageBonus: 0, AvgDamage: 42, DamageType: "poison"}}, Traits: []string{"Amphibious"}},
+		"bone_devil":                {Slug: "bone_devil", Name: "Bone Devil", Size: "large", Type: "fiend", CR: 9, XP: 5000, HP: 142, AC: 19, SpeedWalk: 40, STR: 18, DEX: 16, CON: 18, INT: 13, WIS: 14, CHA: 16, Multiattack: "The devil makes three attacks: two with its claws and one with its sting.", Attacks: []SRDStatAttack{{Name: "Claw", AttackBonus: 8, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "slashing"}, {Name: "Sting", AttackBonus: 8, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "piercing"}}, Traits: []string{"Devil's Sight", "Magic Resistance"}},
+		"clay_golem":                {Slug: "clay_golem", Name: "Clay Golem", Size: "large", Type: "construct", CR: 9, XP: 5000, HP: 133, AC: 14, SpeedWalk: 20, STR: 20, DEX: 9, CON: 18, INT: 3, WIS: 8, CHA: 1, Multiattack: "The golem makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 8, DamageDice: "2d10", DamageBonus: 5, AvgDamage: 16, DamageType: "bludgeoning"}}, Traits: []string{"Acid Absorption", "Berserk", "Immutable Form", "Magic Resistance", "Magic Weapons"}},
+		"cloud_giant":               {Slug: "cloud_giant", Name: "Cloud Giant", Size: "huge", Type: "giant", CR: 9, XP: 5000, HP: 200, AC: 14, SpeedWalk: 40, STR: 27, DEX: 10, CON: 22, INT: 12, WIS: 16, CHA: 16, Multiattack: "The giant makes two morningstar attacks.", Attacks: []SRDStatAttack{{Name: "Morningstar", AttackBonus: 12, DamageDice: "3d8", DamageBonus: 8, AvgDamage: 21, DamageType: "piercing"}, {Name: "Rock", AttackBonus: 12, DamageDice: "4d10", DamageBonus: 8, AvgDamage: 30, DamageType: "bludgeoning"}}, Traits: []string{"Keen Smell", "Innate Spellcasting"}},
+		"fire_giant":                {Slug: "fire_giant", Name: "Fire Giant", Size: "huge", Type: "giant", CR: 9, XP: 5000, HP: 162, AC: 18, SpeedWalk: 30, STR: 25, DEX: 9, CON: 23, INT: 10, WIS: 14, CHA: 13, Multiattack: "The giant makes two greatsword attacks.", Attacks: []SRDStatAttack{{Name: "Greatsword", AttackBonus: 11, DamageDice: "6d6", DamageBonus: 7, AvgDamage: 28, DamageType: "slashing"}, {Name: "Rock", AttackBonus: 11, DamageDice: "4d10", DamageBonus: 7, AvgDamage: 29, DamageType: "bludgeoning"}}},
+		"glabrezu":                  {Slug: "glabrezu", Name: "Glabrezu", Size: "large", Type: "fiend", CR: 9, XP: 5000, HP: 157, AC: 17, SpeedWalk: 40, STR: 20, DEX: 15, CON: 21, INT: 19, WIS: 17, CHA: 16, Multiattack: "The glabrezu makes four attacks: two with its pincers and two with its fists.", Attacks: []SRDStatAttack{{Name: "Pincer", AttackBonus: 9, DamageDice: "2d10", DamageBonus: 5, AvgDamage: 16, DamageType: "bludgeoning"}, {Name: "Fist", AttackBonus: 9, DamageDice: "2d4", DamageBonus: 2, AvgDamage: 7, DamageType: "bludgeoning"}}, Traits: []string{"Innate Spellcasting", "Magic Resistance"}},
+		"treant":                    {Slug: "treant", Name: "Treant", Size: "huge", Type: "plant", CR: 9, XP: 5000, HP: 138, AC: 16, SpeedWalk: 30, STR: 23, DEX: 8, CON: 21, INT: 12, WIS: 16, CHA: 12, Multiattack: "The treant makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 10, DamageDice: "3d6", DamageBonus: 6, AvgDamage: 16, DamageType: "bludgeoning"}, {Name: "Rock", AttackBonus: 10, DamageDice: "4d10", DamageBonus: 6, AvgDamage: 28, DamageType: "bludgeoning"}}, Traits: []string{"False Appearance", "Siege Monster"}},
+		"young_blue_dragon":         {Slug: "young_blue_dragon", Name: "Young Blue Dragon", Size: "large", Type: "dragon", CR: 9, XP: 5000, HP: 152, AC: 18, SpeedWalk: 40, STR: 21, DEX: 10, CON: 19, INT: 14, WIS: 13, CHA: 17, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 9, DamageDice: "2d10+1d10", DamageBonus: 5, AvgDamage: 5, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 9, DamageDice: "2d6", DamageBonus: 5, AvgDamage: 12, DamageType: "slashing"}, {Name: "Lightning Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "10d10", DamageBonus: 0, AvgDamage: 55, DamageType: "lightning"}}},
+		"young_silver_dragon":       {Slug: "young_silver_dragon", Name: "Young Silver Dragon", Size: "large", Type: "dragon", CR: 9, XP: 5000, HP: 168, AC: 18, SpeedWalk: 40, STR: 23, DEX: 10, CON: 21, INT: 14, WIS: 11, CHA: 19, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 10, DamageDice: "2d10", DamageBonus: 6, AvgDamage: 17, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 10, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d8", DamageBonus: 0, AvgDamage: 54, DamageType: "cold"}}},
+		"aboleth":                   {Slug: "aboleth", Name: "Aboleth", Size: "large", Type: "aberration", CR: 10, XP: 5900, HP: 135, AC: 17, SpeedWalk: 10, STR: 21, DEX: 9, CON: 15, INT: 18, WIS: 15, CHA: 18, Multiattack: "The aboleth makes three tentacle attacks.", Attacks: []SRDStatAttack{{Name: "Tentacle", AttackBonus: 9, DamageDice: "2d6", DamageBonus: 5, AvgDamage: 12, DamageType: "bludgeoning"}, {Name: "Tail", AttackBonus: 9, DamageDice: "3d6", DamageBonus: 5, AvgDamage: 15, DamageType: "bludgeoning"}}, Traits: []string{"Amphibious", "Mucous Cloud", "Probing Telepathy"}, Legendary: true},
+		"deva":                      {Slug: "deva", Name: "Deva", Size: "medium", Type: "celestial", CR: 10, XP: 5900, HP: 136, AC: 17, SpeedWalk: 30, STR: 18, DEX: 18, CON: 18, INT: 17, WIS: 20, CHA: 20, Multiattack: "The deva makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Mace", AttackBonus: 8, DamageDice: "1d6+4d8", DamageBonus: 4, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Angelic Weapons", "Innate Spellcasting", "Magic Resistance"}},
+		"guardian_naga":             {Slug: "guardian_naga", Name: "Guardian Naga", Size: "large", Type: "monstrosity", CR: 10, XP: 5900, HP: 127, AC: 18, SpeedWalk: 40, STR: 19, DEX: 18, CON: 16, INT: 16, WIS: 19, CHA: 18, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 8, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "piercing"}, {Name: "Spit Poison", AttackBonus: 8, DamageDice: "10d8", DamageBonus: 0, AvgDamage: 45, DamageType: "poison"}}, Traits: []string{"Rejuvenation", "Spellcasting"}},
+		"stone_golem":               {Slug: "stone_golem", Name: "Stone Golem", Size: "large", Type: "construct", CR: 10, XP: 5900, HP: 178, AC: 17, SpeedWalk: 30, STR: 22, DEX: 9, CON: 20, INT: 3, WIS: 11, CHA: 1, Multiattack: "The golem makes two slam attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 10, DamageDice: "3d8", DamageBonus: 6, AvgDamage: 19, DamageType: "bludgeoning"}}, Traits: []string{"Immutable Form", "Magic Resistance", "Magic Weapons"}},
+		"young_gold_dragon":         {Slug: "young_gold_dragon", Name: "Young Gold Dragon", Size: "large", Type: "dragon", CR: 10, XP: 5900, HP: 178, AC: 18, SpeedWalk: 40, STR: 23, DEX: 14, CON: 21, INT: 16, WIS: 13, CHA: 20, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 10, DamageDice: "2d10", DamageBonus: 6, AvgDamage: 17, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 10, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "10d10", DamageBonus: 0, AvgDamage: 55, DamageType: "fire"}}, Traits: []string{"Amphibious"}},
+		"young_red_dragon":          {Slug: "young_red_dragon", Name: "Young Red Dragon", Size: "large", Type: "dragon", CR: 10, XP: 5900, HP: 178, AC: 18, SpeedWalk: 40, STR: 23, DEX: 10, CON: 21, INT: 14, WIS: 11, CHA: 19, Multiattack: "The dragon makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 10, DamageDice: "2d10+1d6", DamageBonus: 6, AvgDamage: 6, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 10, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Fire Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "16d6", DamageBonus: 0, AvgDamage: 56, DamageType: "fire"}}},
+		"behir":                     {Slug: "behir", Name: "Behir", Size: "huge", Type: "monstrosity", CR: 11, XP: 7200, HP: 168, AC: 17, SpeedWalk: 50, STR: 23, DEX: 16, CON: 18, INT: 7, WIS: 14, CHA: 12, Multiattack: "The behir makes two attacks: one with its bite and one to constrict.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 10, DamageDice: "3d10", DamageBonus: 6, AvgDamage: 22, DamageType: "piercing"}, {Name: "Constrict", AttackBonus: 10, DamageDice: "2d10+2d10", DamageBonus: 6, AvgDamage: 6, DamageType: "bludgeoning"}, {Name: "Lightning Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d10", DamageBonus: 0, AvgDamage: 66, DamageType: "lightning"}, {Name: "Swallow", AttackBonus: 0, DamageDice: "6d6", DamageBonus: 0, AvgDamage: 21, DamageType: "acid"}}},
+		"chain_devil":               {Slug: "chain_devil", Name: "Chain Devil", Size: "medium", Type: "fiend", CR: 11, XP: 7200, HP: 85, AC: 16, SpeedWalk: 30, STR: 18, DEX: 15, CON: 18, INT: 11, WIS: 12, CHA: 14, Multiattack: "The devil makes two attacks with its chains.", Attacks: []SRDStatAttack{{Name: "Chain", AttackBonus: 8, DamageDice: "2d6", DamageBonus: 4, AvgDamage: 11, DamageType: "slashing"}}, Traits: []string{"Devil's Sight", "Magic Resistance"}},
+		"djinni":                    {Slug: "djinni", Name: "Djinni", Size: "large", Type: "elemental", CR: 11, XP: 7200, HP: 161, AC: 17, SpeedWalk: 30, STR: 21, DEX: 15, CON: 22, INT: 15, WIS: 16, CHA: 20, Multiattack: "The djinni makes three scimitar attacks.", Attacks: []SRDStatAttack{{Name: "Scimitar", AttackBonus: 9, DamageDice: "2d6+1d6", DamageBonus: 5, AvgDamage: 5, DamageType: "slashing"}}, Traits: []string{"Elemental Demise", "Innate Spellcasting", "Variant: Genie Powers"}},
+		"efreeti":                   {Slug: "efreeti", Name: "Efreeti", Size: "large", Type: "elemental", CR: 11, XP: 7200, HP: 200, AC: 17, SpeedWalk: 40, STR: 22, DEX: 12, CON: 24, INT: 16, WIS: 15, CHA: 16, Multiattack: "The efreeti makes two scimitar attacks or uses its Hurl Flame twice.", Attacks: []SRDStatAttack{{Name: "Scimitar", AttackBonus: 10, DamageDice: "2d6+2d6", DamageBonus: 6, AvgDamage: 6, DamageType: "slashing"}, {Name: "Hurl Flame", AttackBonus: 7, DamageDice: "5d6", DamageBonus: 0, AvgDamage: 17, DamageType: "fire"}}, Traits: []string{"Elemental Demise", "Innate Spellcasting", "Variant: Genie Powers"}},
+		"gynosphinx":                {Slug: "gynosphinx", Name: "Gynosphinx", Size: "large", Type: "monstrosity", CR: 11, XP: 7200, HP: 136, AC: 17, SpeedWalk: 40, STR: 18, DEX: 15, CON: 16, INT: 18, WIS: 18, CHA: 18, Multiattack: "The sphinx makes two claw attacks.", Attacks: []SRDStatAttack{{Name: "Claw", AttackBonus: 9, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "slashing"}}, Traits: []string{"Inscrutable", "Magic Weapons", "Spellcasting"}, Legendary: true},
+		"horned_devil":              {Slug: "horned_devil", Name: "Horned Devil", Size: "large", Type: "fiend", CR: 11, XP: 7200, HP: 178, AC: 18, SpeedWalk: 20, STR: 22, DEX: 17, CON: 21, INT: 12, WIS: 16, CHA: 17, Multiattack: "The devil makes three melee attacks: two with its fork and one with its tail.", Attacks: []SRDStatAttack{{Name: "Fork", AttackBonus: 10, DamageDice: "2d8", DamageBonus: 6, AvgDamage: 15, DamageType: "piercing"}, {Name: "Tail", AttackBonus: 10, DamageDice: "1d8", DamageBonus: 6, AvgDamage: 10, DamageType: "piercing"}, {Name: "Hurl Flame", AttackBonus: 7, DamageDice: "4d6", DamageBonus: 0, AvgDamage: 14, DamageType: "fire"}}, Traits: []string{"Devil's Sight", "Magic Resistance"}},
+		"remorhaz":                  {Slug: "remorhaz", Name: "Remorhaz", Size: "huge", Type: "monstrosity", CR: 11, XP: 7200, HP: 195, AC: 17, SpeedWalk: 30, STR: 24, DEX: 13, CON: 21, INT: 4, WIS: 10, CHA: 5, Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 11, DamageDice: "6d10+3d6", DamageBonus: 7, AvgDamage: 7, DamageType: "piercing"}}, Traits: []string{"Heated Body"}},
+		"roc":                       {Slug: "roc", Name: "Roc", Size: "gargantuan", Type: "monstrosity", CR: 11, XP: 7200, HP: 248, AC: 15, SpeedWalk: 20, STR: 28, DEX: 10, CON: 20, INT: 3, WIS: 10, CHA: 9, Multiattack: "The roc makes two attacks: one with its beak and one with its talons.", Attacks: []SRDStatAttack{{Name: "Beak", AttackBonus: 13, DamageDice: "4d8", DamageBonus: 9, AvgDamage: 27, DamageType: "piercing"}, {Name: "Talons", AttackBonus: 13, DamageDice: "4d6", DamageBonus: 9, AvgDamage: 23, DamageType: "slashing"}}, Traits: []string{"Keen Sight"}},
+		"archmage":                  {Slug: "archmage", Name: "Archmage", Size: "medium", Type: "humanoid", CR: 12, XP: 8400, HP: 99, AC: 12, SpeedWalk: 30, STR: 10, DEX: 14, CON: 12, INT: 20, WIS: 15, CHA: 16, Attacks: []SRDStatAttack{{Name: "Dagger", AttackBonus: 6, DamageDice: "1d4", DamageBonus: 2, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Magic Resistance", "Spellcasting"}},
+		"erinyes":                   {Slug: "erinyes", Name: "Erinyes", Size: "medium", Type: "fiend", CR: 12, XP: 8400, HP: 153, AC: 18, SpeedWalk: 30, STR: 18, DEX: 16, CON: 18, INT: 14, WIS: 14, CHA: 18, Multiattack: "The erinyes makes three attacks", Attacks: []SRDStatAttack{{Name: "Longsword", AttackBonus: 8, DamageDice: "1d8+3d8", DamageBonus: 4, AvgDamage: 4, DamageType: "slashing"}, {Name: "Longbow", AttackBonus: 7, DamageDice: "1d8+3d8", DamageBonus: 3, AvgDamage: 3, DamageType: "piercing"}}, Traits: []string{"Hellish Weapons", "Magic Resistance"}},
+		"adult_brass_dragon":        {Slug: "adult_brass_dragon", Name: "Adult Brass Dragon", Size: "huge", Type: "dragon", CR: 13, XP: 10000, HP: 172, AC: 18, SpeedWalk: 40, STR: 23, DEX: 10, CON: 21, INT: 14, WIS: 13, CHA: 17, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 11, DamageDice: "2d10", DamageBonus: 6, AvgDamage: 17, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 11, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 11, DamageDice: "2d8", DamageBonus: 6, AvgDamage: 15, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "13d6", DamageBonus: 0, AvgDamage: 45, DamageType: "fire"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"adult_white_dragon":        {Slug: "adult_white_dragon", Name: "Adult White Dragon", Size: "huge", Type: "dragon", CR: 13, XP: 10000, HP: 200, AC: 18, SpeedWalk: 40, STR: 22, DEX: 10, CON: 22, INT: 8, WIS: 12, CHA: 12, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 11, DamageDice: "2d10+1d8", DamageBonus: 6, AvgDamage: 6, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 11, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 11, DamageDice: "2d8", DamageBonus: 6, AvgDamage: 15, DamageType: "bludgeoning"}, {Name: "Cold Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d8", DamageBonus: 0, AvgDamage: 54, DamageType: "cold"}}, Traits: []string{"Ice Walk", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"nalfeshnee":                {Slug: "nalfeshnee", Name: "Nalfeshnee", Size: "large", Type: "fiend", CR: 13, XP: 10000, HP: 184, AC: 18, SpeedWalk: 20, STR: 21, DEX: 10, CON: 22, INT: 19, WIS: 12, CHA: 15, Multiattack: "The nalfeshnee uses Horror Nimbus if it can.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 10, DamageDice: "5d10", DamageBonus: 5, AvgDamage: 32, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 10, DamageDice: "3d6", DamageBonus: 5, AvgDamage: 15, DamageType: "slashing"}}, Traits: []string{"Magic Resistance"}},
+		"rakshasa":                  {Slug: "rakshasa", Name: "Rakshasa", Size: "medium", Type: "fiend", CR: 13, XP: 10000, HP: 110, AC: 16, SpeedWalk: 40, STR: 14, DEX: 17, CON: 18, INT: 13, WIS: 16, CHA: 20, Multiattack: "The rakshasa makes two claw attacks", Attacks: []SRDStatAttack{{Name: "Claw", AttackBonus: 7, DamageDice: "2d6", DamageBonus: 2, AvgDamage: 9, DamageType: "slashing"}}, Traits: []string{"Limited Magic Immunity", "Innate Spellcasting"}},
+		"storm_giant":               {Slug: "storm_giant", Name: "Storm Giant", Size: "huge", Type: "giant", CR: 13, XP: 10000, HP: 230, AC: 16, SpeedWalk: 50, STR: 29, DEX: 14, CON: 20, INT: 16, WIS: 18, CHA: 18, Multiattack: "The giant makes two greatsword attacks.", Attacks: []SRDStatAttack{{Name: "Greatsword", AttackBonus: 14, DamageDice: "6d6", DamageBonus: 9, AvgDamage: 30, DamageType: "slashing"}, {Name: "Rock", AttackBonus: 14, DamageDice: "4d12", DamageBonus: 9, AvgDamage: 35, DamageType: "bludgeoning"}, {Name: "Lightning Strike (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d8", DamageBonus: 0, AvgDamage: 54, DamageType: "lightning"}}, Traits: []string{"Amphibious", "Innate Spellcasting"}},
+		"vampire":                   {Slug: "vampire", Name: "Vampire", Size: "medium", Type: "undead", CR: 13, XP: 10000, HP: 144, AC: 16, SpeedWalk: 30, STR: 18, DEX: 18, CON: 18, INT: 17, WIS: 15, CHA: 18, Attacks: []SRDStatAttack{{Name: "Unarmed Strike (Vampire Form Only)", AttackBonus: 9, DamageDice: "1d8", DamageBonus: 4, AvgDamage: 8, DamageType: "bludgeoning"}, {Name: "Bite (Bat or Vampire Form Only)", AttackBonus: 9, DamageDice: "1d6+3d6", DamageBonus: 4, AvgDamage: 4, DamageType: "piercing"}}, Traits: []string{"Shapechanger", "Legendary Resistance (3/Day)", "Misty Escape", "Regeneration", "Spider Climb", "Vampire Weaknesses"}, Legendary: true},
+		"adult_black_dragon":        {Slug: "adult_black_dragon", Name: "Adult Black Dragon", Size: "huge", Type: "dragon", CR: 14, XP: 11500, HP: 195, AC: 19, SpeedWalk: 40, STR: 23, DEX: 14, CON: 21, INT: 14, WIS: 13, CHA: 17, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 11, DamageDice: "2d10+1d8", DamageBonus: 6, AvgDamage: 6, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 11, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 11, DamageDice: "2d8", DamageBonus: 6, AvgDamage: 15, DamageType: "bludgeoning"}, {Name: "Acid Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d8", DamageBonus: 0, AvgDamage: 54, DamageType: "acid"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"adult_copper_dragon":       {Slug: "adult_copper_dragon", Name: "Adult Copper Dragon", Size: "huge", Type: "dragon", CR: 14, XP: 11500, HP: 184, AC: 18, SpeedWalk: 40, STR: 23, DEX: 12, CON: 21, INT: 18, WIS: 15, CHA: 17, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 11, DamageDice: "2d10", DamageBonus: 6, AvgDamage: 17, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 11, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 11, DamageDice: "2d8", DamageBonus: 6, AvgDamage: 15, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d8", DamageBonus: 0, AvgDamage: 54, DamageType: "acid"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"ice_devil":                 {Slug: "ice_devil", Name: "Ice Devil", Size: "large", Type: "fiend", CR: 14, XP: 11500, HP: 180, AC: 18, SpeedWalk: 40, STR: 21, DEX: 14, CON: 18, INT: 18, WIS: 15, CHA: 18, Multiattack: "The devil makes three attacks: one with its bite, one with its claws, and one with its tail.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 10, DamageDice: "2d6+3d6", DamageBonus: 5, AvgDamage: 5, DamageType: "piercing"}, {Name: "Claws", AttackBonus: 10, DamageDice: "2d4+3d6", DamageBonus: 5, AvgDamage: 5, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 10, DamageDice: "2d6+3d6", DamageBonus: 5, AvgDamage: 5, DamageType: "bludgeoning"}}, Traits: []string{"Devil's Sight", "Magic Resistance"}},
+		"adult_bronze_dragon":       {Slug: "adult_bronze_dragon", Name: "Adult Bronze Dragon", Size: "huge", Type: "dragon", CR: 15, XP: 13000, HP: 212, AC: 19, SpeedWalk: 40, STR: 25, DEX: 10, CON: 23, INT: 16, WIS: 15, CHA: 19, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 12, DamageDice: "2d10", DamageBonus: 7, AvgDamage: 18, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 12, DamageDice: "2d6", DamageBonus: 7, AvgDamage: 14, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 12, DamageDice: "2d8", DamageBonus: 7, AvgDamage: 16, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d10", DamageBonus: 0, AvgDamage: 66, DamageType: "lightning"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"adult_green_dragon":        {Slug: "adult_green_dragon", Name: "Adult Green Dragon", Size: "huge", Type: "dragon", CR: 15, XP: 13000, HP: 207, AC: 19, SpeedWalk: 40, STR: 23, DEX: 12, CON: 21, INT: 18, WIS: 15, CHA: 17, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 11, DamageDice: "2d10+2d6", DamageBonus: 6, AvgDamage: 6, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 11, DamageDice: "2d6", DamageBonus: 6, AvgDamage: 13, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 11, DamageDice: "2d8", DamageBonus: 6, AvgDamage: 15, DamageType: "bludgeoning"}, {Name: "Poison Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "16d6", DamageBonus: 0, AvgDamage: 56, DamageType: "poison"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"mummy_lord":                {Slug: "mummy_lord", Name: "Mummy Lord", Size: "medium", Type: "undead", CR: 15, XP: 13000, HP: 97, AC: 17, SpeedWalk: 20, STR: 18, DEX: 10, CON: 17, INT: 11, WIS: 18, CHA: 16, Multiattack: "The mummy can use its Dreadful Glare and makes one attack with its rotting fist.", Attacks: []SRDStatAttack{{Name: "Rotting Fist", AttackBonus: 9, DamageDice: "3d6+6d6", DamageBonus: 4, AvgDamage: 4, DamageType: "bludgeoning"}}, Traits: []string{"Magic Resistance", "Rejuvenation", "Spellcasting"}, Legendary: true},
+		"purple_worm":               {Slug: "purple_worm", Name: "Purple Worm", Size: "gargantuan", Type: "monstrosity", CR: 15, XP: 13000, HP: 247, AC: 18, SpeedWalk: 50, STR: 28, DEX: 7, CON: 22, INT: 1, WIS: 8, CHA: 4, Multiattack: "The worm makes two attacks: one with its bite and one with its stinger.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 9, DamageDice: "3d8", DamageBonus: 9, AvgDamage: 22, DamageType: "piercing"}, {Name: "Tail Stinger", AttackBonus: 9, DamageDice: "3d6", DamageBonus: 9, AvgDamage: 19, DamageType: "piercing"}}, Traits: []string{"Tunneler"}},
+		"adult_blue_dragon":         {Slug: "adult_blue_dragon", Name: "Adult Blue Dragon", Size: "huge", Type: "dragon", CR: 16, XP: 15000, HP: 225, AC: 19, SpeedWalk: 40, STR: 25, DEX: 10, CON: 23, INT: 16, WIS: 15, CHA: 19, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 12, DamageDice: "2d10+1d10", DamageBonus: 7, AvgDamage: 7, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 12, DamageDice: "2d6", DamageBonus: 7, AvgDamage: 14, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 12, DamageDice: "2d8", DamageBonus: 7, AvgDamage: 16, DamageType: "bludgeoning"}, {Name: "Lightning Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d10", DamageBonus: 0, AvgDamage: 66, DamageType: "lightning"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"adult_silver_dragon":       {Slug: "adult_silver_dragon", Name: "Adult Silver Dragon", Size: "huge", Type: "dragon", CR: 16, XP: 15000, HP: 243, AC: 19, SpeedWalk: 40, STR: 27, DEX: 10, CON: 25, INT: 16, WIS: 13, CHA: 21, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 13, DamageDice: "2d10", DamageBonus: 8, AvgDamage: 19, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 13, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 13, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "13d8", DamageBonus: 0, AvgDamage: 58, DamageType: "cold"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"iron_golem":                {Slug: "iron_golem", Name: "Iron Golem", Size: "large", Type: "construct", CR: 16, XP: 15000, HP: 210, AC: 20, SpeedWalk: 30, STR: 24, DEX: 9, CON: 20, INT: 3, WIS: 11, CHA: 1, Multiattack: "The golem makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Slam", AttackBonus: 13, DamageDice: "3d8", DamageBonus: 7, AvgDamage: 20, DamageType: "bludgeoning"}, {Name: "Sword", AttackBonus: 13, DamageDice: "3d10", DamageBonus: 7, AvgDamage: 23, DamageType: "slashing"}, {Name: "Poison Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "10d8", DamageBonus: 0, AvgDamage: 45, DamageType: "poison"}}, Traits: []string{"Fire Absorption", "Immutable Form", "Magic Resistance", "Magic Weapons"}},
+		"marilith":                  {Slug: "marilith", Name: "Marilith", Size: "large", Type: "fiend", CR: 16, XP: 15000, HP: 189, AC: 18, SpeedWalk: 40, STR: 18, DEX: 20, CON: 20, INT: 18, WIS: 16, CHA: 20, Multiattack: "The marilith can make seven attacks: six with its longswords and one with its tail.", Attacks: []SRDStatAttack{{Name: "Longsword", AttackBonus: 9, DamageDice: "2d8", DamageBonus: 4, AvgDamage: 13, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 9, DamageDice: "2d10", DamageBonus: 4, AvgDamage: 15, DamageType: "bludgeoning"}}, Traits: []string{"Magic Resistance", "Magic Weapons", "Reactive"}},
+		"planetar":                  {Slug: "planetar", Name: "Planetar", Size: "large", Type: "celestial", CR: 16, XP: 15000, HP: 200, AC: 19, SpeedWalk: 40, STR: 24, DEX: 20, CON: 24, INT: 19, WIS: 22, CHA: 25, Multiattack: "The planetar makes two melee attacks.", Attacks: []SRDStatAttack{{Name: "Greatsword", AttackBonus: 12, DamageDice: "4d6+5d8", DamageBonus: 7, AvgDamage: 7, DamageType: "slashing"}}, Traits: []string{"Angelic Weapons", "Divine Awareness", "Innate Spellcasting", "Magic Resistance"}},
+		"adult_gold_dragon":         {Slug: "adult_gold_dragon", Name: "Adult Gold Dragon", Size: "huge", Type: "dragon", CR: 17, XP: 18000, HP: 256, AC: 19, SpeedWalk: 40, STR: 27, DEX: 14, CON: 25, INT: 16, WIS: 15, CHA: 24, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 14, DamageDice: "2d10", DamageBonus: 8, AvgDamage: 19, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 14, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 14, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "12d10", DamageBonus: 0, AvgDamage: 66, DamageType: "fire"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"adult_red_dragon":          {Slug: "adult_red_dragon", Name: "Adult Red Dragon", Size: "huge", Type: "dragon", CR: 17, XP: 18000, HP: 256, AC: 19, SpeedWalk: 40, STR: 27, DEX: 10, CON: 25, INT: 16, WIS: 13, CHA: 21, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 14, DamageDice: "2d10+2d6", DamageBonus: 8, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 14, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 14, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}, {Name: "Fire Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "18d6", DamageBonus: 0, AvgDamage: 63, DamageType: "fire"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"androsphinx":               {Slug: "androsphinx", Name: "Androsphinx", Size: "large", Type: "monstrosity", CR: 17, XP: 18000, HP: 199, AC: 17, SpeedWalk: 40, STR: 22, DEX: 10, CON: 20, INT: 16, WIS: 18, CHA: 23, Multiattack: "The sphinx makes two claw attacks.", Attacks: []SRDStatAttack{{Name: "Claw", AttackBonus: 12, DamageDice: "2d10", DamageBonus: 6, AvgDamage: 17, DamageType: "slashing"}}, Traits: []string{"Inscrutable", "Magic Weapons", "Spellcasting"}, Legendary: true},
+		"dragon_turtle":             {Slug: "dragon_turtle", Name: "Dragon Turtle", Size: "gargantuan", Type: "dragon", CR: 17, XP: 18000, HP: 341, AC: 20, SpeedWalk: 20, STR: 25, DEX: 10, CON: 20, INT: 10, WIS: 12, CHA: 12, Multiattack: "The dragon turtle makes three attacks: one with its bite and two with its claws.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 13, DamageDice: "3d12", DamageBonus: 7, AvgDamage: 26, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 13, DamageDice: "2d8", DamageBonus: 7, AvgDamage: 16, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 13, DamageDice: "3d12", DamageBonus: 7, AvgDamage: 26, DamageType: "bludgeoning"}, {Name: "Steam Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "15d6", DamageBonus: 0, AvgDamage: 52, DamageType: "fire"}}, Traits: []string{"Amphibious"}},
+		"balor":                     {Slug: "balor", Name: "Balor", Size: "huge", Type: "fiend", CR: 19, XP: 22000, HP: 262, AC: 19, SpeedWalk: 40, STR: 26, DEX: 15, CON: 22, INT: 20, WIS: 16, CHA: 22, Multiattack: "The balor makes two attacks: one with its longsword and one with its whip.", Attacks: []SRDStatAttack{{Name: "Longsword", AttackBonus: 14, DamageDice: "3d8+3d8", DamageBonus: 8, AvgDamage: 8, DamageType: "slashing"}, {Name: "Whip", AttackBonus: 14, DamageDice: "2d6+3d6", DamageBonus: 8, AvgDamage: 8, DamageType: "slashing"}}, Traits: []string{"Death Throes", "Fire Aura", "Magic Resistance", "Magic Weapons"}},
+		"ancient_brass_dragon":      {Slug: "ancient_brass_dragon", Name: "Ancient Brass Dragon", Size: "gargantuan", Type: "dragon", CR: 20, XP: 25000, HP: 297, AC: 20, SpeedWalk: 40, STR: 27, DEX: 10, CON: 25, INT: 16, WIS: 15, CHA: 19, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 14, DamageDice: "2d10", DamageBonus: 8, AvgDamage: 19, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 14, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 14, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "16d6", DamageBonus: 0, AvgDamage: 56, DamageType: "fire"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"ancient_white_dragon":      {Slug: "ancient_white_dragon", Name: "Ancient White Dragon", Size: "gargantuan", Type: "dragon", CR: 20, XP: 25000, HP: 333, AC: 20, SpeedWalk: 40, STR: 26, DEX: 10, CON: 26, INT: 10, WIS: 13, CHA: 14, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 14, DamageDice: "2d10+2d8", DamageBonus: 8, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 14, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 14, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}, {Name: "Cold Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "16d8", DamageBonus: 0, AvgDamage: 72, DamageType: "cold"}}, Traits: []string{"Ice Walk", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"pit_fiend":                 {Slug: "pit_fiend", Name: "Pit Fiend", Size: "large", Type: "fiend", CR: 20, XP: 25000, HP: 300, AC: 19, SpeedWalk: 30, STR: 26, DEX: 14, CON: 24, INT: 22, WIS: 18, CHA: 24, Multiattack: "The pit fiend makes four attacks: one with its bite, one with its claw, one with its mace, and one with its tail.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 14, DamageDice: "4d6", DamageBonus: 8, AvgDamage: 22, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 14, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "slashing"}, {Name: "Mace", AttackBonus: 14, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "bludgeoning"}, {Name: "Tail", AttackBonus: 14, DamageDice: "3d10", DamageBonus: 8, AvgDamage: 24, DamageType: "bludgeoning"}}, Traits: []string{"Fear Aura", "Magic Resistance", "Magic Weapons", "Innate Spellcasting"}},
+		"ancient_black_dragon":      {Slug: "ancient_black_dragon", Name: "Ancient Black Dragon", Size: "gargantuan", Type: "dragon", CR: 21, XP: 33000, HP: 367, AC: 22, SpeedWalk: 40, STR: 27, DEX: 14, CON: 25, INT: 16, WIS: 15, CHA: 19, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 15, DamageDice: "2d10+2d8", DamageBonus: 8, AvgDamage: 8, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 15, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 15, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"ancient_copper_dragon":     {Slug: "ancient_copper_dragon", Name: "Ancient Copper Dragon", Size: "gargantuan", Type: "dragon", CR: 21, XP: 33000, HP: 350, AC: 21, SpeedWalk: 40, STR: 27, DEX: 12, CON: 25, INT: 20, WIS: 17, CHA: 19, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 15, DamageDice: "2d10", DamageBonus: 8, AvgDamage: 19, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 15, DamageDice: "2d6", DamageBonus: 8, AvgDamage: 15, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 15, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "14d8", DamageBonus: 0, AvgDamage: 63, DamageType: "acid"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"lich":                      {Slug: "lich", Name: "Lich", Size: "medium", Type: "undead", CR: 21, XP: 33000, HP: 135, AC: 17, SpeedWalk: 30, STR: 11, DEX: 16, CON: 16, INT: 20, WIS: 14, CHA: 16, Attacks: []SRDStatAttack{{Name: "Paralyzing Touch", AttackBonus: 12, DamageDice: "3d6", DamageBonus: 0, AvgDamage: 10, DamageType: "cold"}}, Traits: []string{"Legendary Resistance (3/Day)", "Rejuvenation", "Spellcasting", "Turn Resistance"}, Legendary: true},
+		"solar":                     {Slug: "solar", Name: "Solar", Size: "large", Type: "celestial", CR: 21, XP: 33000, HP: 243, AC: 21, SpeedWalk: 50, STR: 26, DEX: 22, CON: 26, INT: 25, WIS: 25, CHA: 30, Multiattack: "The solar makes two greatsword attacks.", Attacks: []SRDStatAttack{{Name: "Greatsword", AttackBonus: 15, DamageDice: "4d6+6d8", DamageBonus: 8, AvgDamage: 8, DamageType: "slashing"}, {Name: "Slaying Longbow", AttackBonus: 13, DamageDice: "2d8+6d8", DamageBonus: 6, AvgDamage: 6, DamageType: "piercing"}}, Traits: []string{"Angelic Weapons", "Divine Awareness", "Innate Spellcasting", "Magic Resistance"}, Legendary: true},
+		"ancient_bronze_dragon":     {Slug: "ancient_bronze_dragon", Name: "Ancient Bronze Dragon", Size: "gargantuan", Type: "dragon", CR: 22, XP: 41000, HP: 444, AC: 22, SpeedWalk: 40, STR: 29, DEX: 10, CON: 27, INT: 18, WIS: 17, CHA: 21, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 16, DamageDice: "2d10", DamageBonus: 9, AvgDamage: 20, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 16, DamageDice: "1d6", DamageBonus: 9, AvgDamage: 12, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 16, DamageDice: "2d8", DamageBonus: 9, AvgDamage: 18, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "16d10", DamageBonus: 0, AvgDamage: 88, DamageType: "lightning"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"ancient_green_dragon":      {Slug: "ancient_green_dragon", Name: "Ancient Green Dragon", Size: "gargantuan", Type: "dragon", CR: 22, XP: 41000, HP: 385, AC: 21, SpeedWalk: 40, STR: 27, DEX: 12, CON: 25, INT: 20, WIS: 17, CHA: 19, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 15, DamageDice: "2d10+3d6", DamageBonus: 9, AvgDamage: 9, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 15, DamageDice: "4d6", DamageBonus: 8, AvgDamage: 22, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 15, DamageDice: "2d8", DamageBonus: 8, AvgDamage: 17, DamageType: "bludgeoning"}, {Name: "Poison Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "22d6", DamageBonus: 0, AvgDamage: 77, DamageType: "poison"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"ancient_blue_dragon":       {Slug: "ancient_blue_dragon", Name: "Ancient Blue Dragon", Size: "gargantuan", Type: "dragon", CR: 23, XP: 50000, HP: 481, AC: 22, SpeedWalk: 40, STR: 29, DEX: 10, CON: 27, INT: 18, WIS: 17, CHA: 21, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 16, DamageDice: "2d10+2d10", DamageBonus: 9, AvgDamage: 9, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 16, DamageDice: "2d6", DamageBonus: 9, AvgDamage: 16, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 16, DamageDice: "2d8", DamageBonus: 9, AvgDamage: 18, DamageType: "bludgeoning"}, {Name: "Lightning Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "16d10", DamageBonus: 0, AvgDamage: 88, DamageType: "lightning"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"ancient_silver_dragon":     {Slug: "ancient_silver_dragon", Name: "Ancient Silver Dragon", Size: "gargantuan", Type: "dragon", CR: 23, XP: 50000, HP: 487, AC: 22, SpeedWalk: 40, STR: 30, DEX: 10, CON: 29, INT: 18, WIS: 15, CHA: 23, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 17, DamageDice: "2d10", DamageBonus: 10, AvgDamage: 21, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 17, DamageDice: "2d6", DamageBonus: 10, AvgDamage: 17, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 17, DamageDice: "2d8", DamageBonus: 10, AvgDamage: 19, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "15d8", DamageBonus: 0, AvgDamage: 67, DamageType: "cold"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"kraken":                    {Slug: "kraken", Name: "Kraken", Size: "gargantuan", Type: "monstrosity", CR: 23, XP: 50000, HP: 472, AC: 18, SpeedWalk: 20, STR: 30, DEX: 11, CON: 25, INT: 22, WIS: 18, CHA: 20, Multiattack: "The kraken makes three tentacle attacks, each of which it can replace with one use of Fling.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 7, DamageDice: "3d8", DamageBonus: 10, AvgDamage: 23, DamageType: "piercing"}, {Name: "Tentacle", AttackBonus: 7, DamageDice: "3d6", DamageBonus: 10, AvgDamage: 20, DamageType: "bludgeoning"}, {Name: "Lightning Storm", AttackBonus: 0, DamageDice: "4d10", DamageBonus: 0, AvgDamage: 22, DamageType: "lightning"}}, Traits: []string{"Amphibious", "Freedom of Movement", "Siege Monster"}, Legendary: true},
+		"ancient_gold_dragon":       {Slug: "ancient_gold_dragon", Name: "Ancient Gold Dragon", Size: "gargantuan", Type: "dragon", CR: 24, XP: 62000, HP: 546, AC: 22, SpeedWalk: 40, STR: 30, DEX: 14, CON: 29, INT: 18, WIS: 17, CHA: 28, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 17, DamageDice: "2d10", DamageBonus: 10, AvgDamage: 21, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 17, DamageDice: "2d6", DamageBonus: 10, AvgDamage: 17, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 17, DamageDice: "2d8", DamageBonus: 10, AvgDamage: 19, DamageType: "bludgeoning"}, {Name: "Breath Weapons (Recharge 5-6)", AttackBonus: 0, DamageDice: "13d10", DamageBonus: 0, AvgDamage: 71, DamageType: "fire"}}, Traits: []string{"Amphibious", "Legendary Resistance (3/Day)"}, Legendary: true},
+		"ancient_red_dragon":        {Slug: "ancient_red_dragon", Name: "Ancient Red Dragon", Size: "gargantuan", Type: "dragon", CR: 24, XP: 62000, HP: 546, AC: 22, SpeedWalk: 40, STR: 30, DEX: 10, CON: 29, INT: 18, WIS: 15, CHA: 23, Multiattack: "The dragon can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 17, DamageDice: "2d10+4d6", DamageBonus: 10, AvgDamage: 10, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 17, DamageDice: "2d6", DamageBonus: 10, AvgDamage: 17, DamageType: "slashing"}, {Name: "Tail", AttackBonus: 17, DamageDice: "2d8", DamageBonus: 10, AvgDamage: 19, DamageType: "bludgeoning"}, {Name: "Fire Breath (Recharge 5-6)", AttackBonus: 0, DamageDice: "26d6", DamageBonus: 0, AvgDamage: 91, DamageType: "fire"}}, Traits: []string{"Legendary Resistance (3/Day)"}, Legendary: true},
+		"tarrasque":                 {Slug: "tarrasque", Name: "Tarrasque", Size: "gargantuan", Type: "monstrosity", CR: 30, XP: 155000, HP: 676, AC: 25, SpeedWalk: 40, STR: 30, DEX: 11, CON: 30, INT: 3, WIS: 11, CHA: 11, Multiattack: "The tarrasque can use its Frightful Presence.", Attacks: []SRDStatAttack{{Name: "Bite", AttackBonus: 19, DamageDice: "4d12", DamageBonus: 10, AvgDamage: 36, DamageType: "piercing"}, {Name: "Claw", AttackBonus: 19, DamageDice: "4d8", DamageBonus: 10, AvgDamage: 28, DamageType: "slashing"}, {Name: "Horns", AttackBonus: 19, DamageDice: "4d10", DamageBonus: 10, AvgDamage: 32, DamageType: "piercing"}, {Name: "Tail", AttackBonus: 19, DamageDice: "4d6", DamageBonus: 10, AvgDamage: 24, DamageType: "bludgeoning"}}, Traits: []string{"Legendary Resistance (3/Day)", "Magic Resistance", "Reflective Carapace", "Siege Monster"}, Legendary: true},
+	}
+}

internal/plugin/bestiary_srd_data_test.go

@@ -0,0 +1,68 @@
+package plugin
+
+import "testing"
+
+// TestSRDStagingBestiary_Populated guards the generated raw SRD staging table:
+// the full SRD dump should be present and structurally sane. Regenerate with
+// `go run ./cmd/open5e-import (fetch|gen) bestiary` if the SRD set changes.
+func TestSRDStagingBestiary_Populated(t *testing.T) {
+	if len(srdStagingBestiary) < 300 {
+		t.Fatalf("srdStagingBestiary has %d entries, want the full SRD set (~322)", len(srdStagingBestiary))
+	}
+
+	for slug, m := range srdStagingBestiary {
+		if m.Slug != slug {
+			t.Errorf("%s: Slug field = %q, want map key", slug, m.Slug)
+		}
+		if m.Name == "" {
+			t.Errorf("%s: empty Name", slug)
+		}
+		if m.HP <= 0 || m.AC <= 0 {
+			t.Errorf("%s: HP=%d AC=%d, want both positive", slug, m.HP, m.AC)
+		}
+		for _, a := range m.Attacks {
+			// AvgDamage is precomputed; a parsed attack should carry dice and a
+			// non-negative average (flat negative bonuses can zero it, not less).
+			if a.DamageDice == "" {
+				t.Errorf("%s: attack %q has no DamageDice", slug, a.Name)
+			}
+			if a.AvgDamage < 0 {
+				t.Errorf("%s: attack %q AvgDamage=%d, want >= 0", slug, a.Name, a.AvgDamage)
+			}
+		}
+	}
+}
+
+// TestSRDStagingBestiary_KnownEntry spot-checks a canonical stat block so a
+// classifier regression surfaces as a value mismatch, not a silent drift.
+func TestSRDStagingBestiary_KnownEntry(t *testing.T) {
+	ab, ok := srdStagingBestiary["aboleth"]
+	if !ok {
+		t.Fatal("aboleth missing from staging bestiary")
+	}
+	if ab.HP != 135 || ab.AC != 17 || ab.CR != 10 {
+		t.Errorf("aboleth = HP %d / AC %d / CR %v, want 135 / 17 / 10", ab.HP, ab.AC, ab.CR)
+	}
+	if ab.XP != 5900 {
+		t.Errorf("aboleth XP = %d, want 5900 (derived from CR 10)", ab.XP)
+	}
+	if ab.Multiattack == "" {
+		t.Error("aboleth should have a Multiattack description")
+	}
+	if !ab.Legendary {
+		t.Error("aboleth should be flagged Legendary")
+	}
+	// Tentacle: +9 to hit, 2d6+5 → avg 12.
+	var tentacle *SRDStatAttack
+	for i := range ab.Attacks {
+		if ab.Attacks[i].Name == "Tentacle" {
+			tentacle = &ab.Attacks[i]
+		}
+	}
+	if tentacle == nil {
+		t.Fatal("aboleth missing Tentacle attack")
+	}
+	if tentacle.AttackBonus != 9 || tentacle.DamageDice != "2d6" || tentacle.AvgDamage != 12 {
+		t.Errorf("aboleth Tentacle = %+v, want +9 / 2d6 / avg 12", *tentacle)
+	}
+}

internal/plugin/bestiary_srd_staging.go

@@ -0,0 +1,57 @@
+package plugin
+
+// Raw Open5e SRD stat blocks — the balance-baseline staging table.
+//
+// Unlike dndBestiary (hand-tuned named monsters) and srdProfiles (hand-tuned
+// turn-based multiattack), this table is the *unmodified* SRD: HP, AC, ability
+// scores, and per-attack damage dice straight from the 5e SRD dump. Raw SRD
+// damage is calibrated for a 4-PC party and one-shots gogobee's single player
+// (see bestiary_srd.go's balance-basis note), so this is NOT a drop-in roster —
+// nothing here feeds the combat engine directly.
+//
+// What it IS: the reference the tuning pass reads against. When authoring or
+// rebalancing a dndBestiary entry, srdStagingBestiary[id] gives the canonical
+// SRD numbers to scale down from, so tuning is a deliberate derivation rather
+// than a guess. Generated by cmd/open5e-import — see bestiary_srd_data.go.
+//
+// File is intentionally NOT dnd_-prefixed (see memory: no new dnd_* identifiers).
+
+// SRDStatAttack is one weapon attack from a creature's SRD action list: the
+// d20 to-hit bonus plus the raw damage dice (e.g. "2d6") and flat bonus, with
+// AvgDamage precomputed as dice average + bonus for quick comparison.
+type SRDStatAttack struct {
+	Name        string
+	AttackBonus int
+	DamageDice  string
+	DamageBonus int
+	AvgDamage   int
+	DamageType  string
+}
+
+// SRDStatBlock is a raw SRD creature stat block. CR/XP/HP/AC and the ability
+// scores are verbatim SRD; Attacks holds each non-Multiattack weapon action;
+// Multiattack carries the multiattack action's text so the tuning pass knows
+// how many strikes a turn the creature makes. Traits lists the creature's
+// special-ability names (Pack Tactics, Regeneration, …) — names only, since
+// their mechanics live in the hand-authored MonsterAbility profiles.
+type SRDStatBlock struct {
+	Slug        string
+	Name        string
+	Size        string
+	Type        string
+	CR          float64
+	XP          int
+	HP          int
+	AC          int
+	SpeedWalk   int // feet; falls back to fastest other mode for flyers/swimmers
+	STR, DEX    int
+	CON, INT    int
+	WIS, CHA    int
+	Multiattack string
+	Attacks     []SRDStatAttack
+	Traits      []string
+	Legendary   bool
+}
+
+// srdStagingBestiary is the full raw SRD bestiary, keyed by slug (hyphens → underscores).
+var srdStagingBestiary = buildSRDStagingBestiary()

internal/plugin/bestiary_srd_test.go

@@ -0,0 +1,333 @@
+package plugin
+
+import (
+	"math/rand/v2"
+	"testing"
+)
+
+func TestEnemyAttackProfile_Fallback(t *testing.T) {
+	// An unregistered creature makes a single attack derived from its template
+	// stats — same behaviour as before the multiattack upgrade.
+	stats := CombatStats{Attack: 9, AttackBonus: 4}
+	got := enemyAttackProfile("not_in_registry", stats)
+	if len(got) != 1 {
+		t.Fatalf("len = %d, want 1 (single fallback attack)", len(got))
+	}
+	if got[0].Damage != 9 || got[0].AttackBonus != 4 {
+		t.Errorf("fallback attack = %+v, want damage 9 / bonus 4", got[0])
+	}
+}
+
+func TestEnemyAttackProfile_Registered(t *testing.T) {
+	// A registered elite returns its full multiattack profile.
+	got := enemyAttackProfile("owlbear", CombatStats{Attack: 99, AttackBonus: 99})
+	if len(got) != 2 {
+		t.Fatalf("owlbear len = %d, want 2 (Beak + Claws)", len(got))
+	}
+	// Profile values win over the template stats.
+	if got[0].AttackBonus == 99 || got[1].AttackBonus == 99 {
+		t.Errorf("profile should not inherit template AttackBonus: %+v", got)
+	}
+
+	// A zero per-attack AttackBonus falls back to the (tier-scaled) template
+	// bonus so authoring can leave it blank.
+	srdProfiles["__test_zero_bonus"] = SRDProfile{Attacks: []SRDAttack{{Name: "Slam", Damage: 5}}}
+	defer delete(srdProfiles, "__test_zero_bonus")
+	zb := enemyAttackProfile("__test_zero_bonus", CombatStats{Attack: 1, AttackBonus: 7})
+	if zb[0].AttackBonus != 7 {
+		t.Errorf("zero-bonus attack = %+v, want AttackBonus 7 from template", zb[0])
+	}
+}
+
+func TestTurnAbilityFires(t *testing.T) {
+	enemy := baseEnemy() // MaxHP 60
+	st := &combatState{rng: rand.New(rand.NewPCG(1, 1))}
+
+	cases := []struct {
+		name     string
+		phase    string
+		round    int
+		enemyHP  int
+		eligible bool
+	}{
+		{"any always eligible", "any", 5, 60, true},
+		{"opening round 1", "opening", 1, 60, true},
+		{"opening past round 1", "opening", 2, 60, false},
+		{"clash past round 1", "clash", 2, 60, true},
+		{"clash round 1", "clash", 1, 60, false},
+		{"decisive when bloodied", "decisive", 3, 20, true},
+		{"decisive when healthy", "decisive", 3, 60, false},
+	}
+	for _, c := range cases {
+		st.round = c.round
+		st.enemyHP = c.enemyHP
+		// ProcChance 1.0: fires iff eligible. ProcChance 0.0: never fires.
+		alwaysProc := &MonsterAbility{Phase: c.phase, ProcChance: 1.0}
+		if got := turnAbilityFires(alwaysProc, st, &enemy); got != c.eligible {
+			t.Errorf("%s: fired=%v, want %v", c.name, got, c.eligible)
+		}
+		neverProc := &MonsterAbility{Phase: c.phase, ProcChance: 0.0}
+		if turnAbilityFires(neverProc, st, &enemy) {
+			t.Errorf("%s: a 0%% proc chance ability should never fire", c.name)
+		}
+	}
+}
+
+// TestApplyAbility_Slice2Effects covers the immediate-resolution monster
+// ability effects: damage riders and the enemy self-heal. All resolve fully
+// within applyAbility with no persistent state.
+func TestApplyAbility_Slice2Effects(t *testing.T) {
+	newState := func(playerHP, enemyHP int) (*combatState, Combatant, Combatant) {
+		st := &combatState{
+			playerHP: playerHP, enemyHP: enemyHP, round: 1,
+			rng: rand.New(rand.NewPCG(7, 7)),
+		}
+		return st, basePlayer(), baseEnemy()
+	}
+	phase := &turnCombatPhase
+	res := &CombatResult{}
+
+	damageEffects := []string{"bonus_damage", "aoe", "aoe_fire", "death_aoe", "execute"}
+	for _, eff := range damageEffects {
+		st, player, enemy := newState(100, 60)
+		enemy.Ability = &MonsterAbility{Name: "Test " + eff, Effect: eff}
+		if applyAbility(st, &player, &enemy, phase, res) {
+			t.Errorf("%s: should not down a full-HP player", eff)
+		}
+		if st.playerHP >= 100 {
+			t.Errorf("%s: player HP = %d, want < 100 (damage rider)", eff, st.playerHP)
+		}
+		if len(st.events) != 1 || st.events[0].Damage <= 0 {
+			t.Errorf("%s: want one event with positive damage, got %+v", eff, st.events)
+		}
+	}
+
+	// execute hits harder once the player is under 30% HP.
+	stLow, pl, en := newState(20, 60)
+	en.Ability = &MonsterAbility{Name: "Wail", Effect: "execute"}
+	applyAbility(stLow, &pl, &en, phase, res)
+	lowDmg := 20 - stLow.playerHP
+	stHigh, pl2, en2 := newState(100, 60)
+	en2.Ability = &MonsterAbility{Name: "Wail", Effect: "execute"}
+	applyAbility(stHigh, &pl2, &en2, phase, res)
+	highDmg := 100 - stHigh.playerHP
+	if lowDmg <= highDmg {
+		t.Errorf("execute: low-HP damage %d should exceed full-HP damage %d", lowDmg, highDmg)
+	}
+
+	// self_heal restores enemy HP, capped at MaxHP.
+	stHeal, plH, enH := newState(100, 30)
+	enH.Ability = &MonsterAbility{Name: "Regrow", Effect: "self_heal"}
+	applyAbility(stHeal, &plH, &enH, phase, res)
+	if stHeal.enemyHP <= 30 || stHeal.enemyHP > enH.Stats.MaxHP {
+		t.Errorf("self_heal: enemy HP = %d, want in (30, %d]", stHeal.enemyHP, enH.Stats.MaxHP)
+	}
+
+	// A damage rider that drops the player returns true (no death save armed).
+	stKill, plK, enK := newState(1, 60)
+	enK.Ability = &MonsterAbility{Name: "Smash", Effect: "bonus_damage"}
+	if !applyAbility(stKill, &plK, &enK, phase, res) {
+		t.Error("bonus_damage: lethal hit on a 1-HP player should return true")
+	}
+}
+
+// TestApplyAbility_Slice3Effects covers the stateful monster-ability effects:
+// applyAbility arms a combatState flag/counter (and emits an announcement for
+// all but evade), and the shared resolution primitives read that state.
+func TestApplyAbility_Slice3Effects(t *testing.T) {
+	newState := func(playerHP, enemyHP int) (*combatState, Combatant, Combatant) {
+		st := &combatState{
+			playerHP: playerHP, enemyHP: enemyHP, round: 1,
+			rng: rand.New(rand.NewPCG(9, 9)),
+		}
+		return st, basePlayer(), baseEnemy()
+	}
+	phase := &turnCombatPhase
+	res := &CombatResult{}
+
+	// Each effect arms its combatState field and (except evade) announces itself.
+	st, pl, en := newState(100, 60)
+	en.Ability = &MonsterAbility{Name: "Scurry", Effect: "evade"}
+	applyAbility(st, &pl, &en, phase, res)
+	if !st.enemyEvadeNext || len(st.events) != 0 {
+		t.Errorf("evade: want enemyEvadeNext set and no event, got flag=%v events=%d", st.enemyEvadeNext, len(st.events))
+	}
+
+	armChecks := []struct {
+		effect string
+		armed  func(*combatState) bool
+	}{
+		{"block", func(s *combatState) bool { return s.enemyBlockUp }},
+		{"advantage", func(s *combatState) bool { return s.enemyAdvantage }},
+		{"retaliate", func(s *combatState) bool { return s.enemyRetaliateFrac > 0 }},
+		{"regenerate", func(s *combatState) bool { return s.enemyRegen > 0 }},
+		{"survive_at_1", func(s *combatState) bool { return s.enemySurviveArmed }},
+		{"stat_drain", func(s *combatState) bool { return s.playerAtkDrain > 0 }},
+		{"debuff", func(s *combatState) bool { return s.playerACDebuff > 0 }},
+	}
+	for _, c := range armChecks {
+		st, pl, en := newState(100, 60)
+		en.Ability = &MonsterAbility{Name: "Test " + c.effect, Effect: c.effect}
+		if applyAbility(st, &pl, &en, phase, res) {
+			t.Errorf("%s: should not down a full-HP player", c.effect)
+		}
+		if !c.armed(st) {
+			t.Errorf("%s: combatState flag not armed", c.effect)
+		}
+		if len(st.events) != 1 {
+			t.Errorf("%s: want one announcement event, got %d", c.effect, len(st.events))
+		}
+	}
+
+	// max_hp_drain lowers effective MaxHP and deals that much immediate damage.
+	stD, plD, enD := newState(100, 60)
+	enD.Ability = &MonsterAbility{Name: "Corrupting Touch", Effect: "max_hp_drain"}
+	applyAbility(stD, &plD, &enD, phase, res)
+	if stD.maxHPDrain <= 0 || stD.playerHP != 100-stD.maxHPDrain {
+		t.Errorf("max_hp_drain: drain=%d playerHP=%d, want playerHP = 100-drain", stD.maxHPDrain, stD.playerHP)
+	}
+
+	// enemyDown lets survive_at_1 cheat death exactly once.
+	stS := &combatState{enemyHP: 0, enemySurviveArmed: true}
+	if enemyDown(stS, "Duel") {
+		t.Error("survive_at_1: armed enemy at 0 HP should not be down")
+	}
+	if stS.enemyHP != 1 || stS.enemySurviveArmed {
+		t.Errorf("survive_at_1: want enemyHP=1 and flag cleared, got hp=%d armed=%v", stS.enemyHP, stS.enemySurviveArmed)
+	}
+	stS.enemyHP = 0
+	if !enemyDown(stS, "Duel") {
+		t.Error("survive_at_1: second drop to 0 should be lethal (one-shot spent)")
+	}
+
+	// evade is consumed by the next player weapon attack — a guaranteed miss.
+	stE, plE, enE := newState(100, 60)
+	stE.enemyEvadeNext = true
+	if resolvePlayerAttack(stE, &plE, &enE, phase, res) {
+		t.Error("evade: a whiffed attack should not end the fight")
+	}
+	if stE.enemyEvadeNext || stE.enemyHP != 60 {
+		t.Errorf("evade: want flag cleared and enemyHP unchanged, got flag=%v hp=%d", stE.enemyEvadeNext, stE.enemyHP)
+	}
+
+	// retaliate reflects a fraction of every player hit back at the player.
+	stR, plR, enR := newState(100, 60)
+	stR.enemyRetaliateFrac = 0.5
+	resolvePlayerAttack(stR, &plR, &enR, phase, res)
+	if stR.playerHP >= 100 {
+		t.Errorf("retaliate: player HP = %d, want < 100 (reflected damage)", stR.playerHP)
+	}
+}
+
+// TestApplyAbility_Slice4Effects covers the former flavor-only placeholders,
+// now backed by real state: applyAbility arms a combatState field and announces
+// itself, and the shared resolution primitives / helpers read that state.
+func TestApplyAbility_Slice4Effects(t *testing.T) {
+	newState := func(playerHP, enemyHP int) (*combatState, Combatant, Combatant) {
+		st := &combatState{
+			playerHP: playerHP, enemyHP: enemyHP, round: 1,
+			rng: rand.New(rand.NewPCG(11, 11)),
+		}
+		return st, basePlayer(), baseEnemy()
+	}
+	phase := &turnCombatPhase
+	res := &CombatResult{}
+
+	armChecks := []struct {
+		effect string
+		armed  func(*combatState) bool
+	}{
+		{"spell_resist", func(s *combatState) bool { return s.enemySpellResist }},
+		{"reveal_action", func(s *combatState) bool { return s.enemyRevealNext }},
+		{"fear_immune", func(s *combatState) bool { return s.enemyFearImmune }},
+		{"ally_buff", func(s *combatState) bool { return s.enemyAtkBuff > 0 }},
+	}
+	for _, c := range armChecks {
+		st, pl, en := newState(100, 60)
+		en.Ability = &MonsterAbility{Name: "Test " + c.effect, Effect: c.effect}
+		if applyAbility(st, &pl, &en, phase, res) {
+			t.Errorf("%s: should not down a full-HP player", c.effect)
+		}
+		if !c.armed(st) {
+			t.Errorf("%s: combatState field not armed", c.effect)
+		}
+		if st.playerHP != 100 || st.enemyHP != 60 {
+			t.Errorf("%s: HP changed (%d/%d), want 100/60", c.effect, st.playerHP, st.enemyHP)
+		}
+		if len(st.events) != 1 {
+			t.Errorf("%s: want one announcement event, got %d", c.effect, len(st.events))
+		}
+	}
+
+	// The passive immunities are honoured straight off the ability profile,
+	// before the per-round proc has armed the flag.
+	st, _, en := newState(100, 60)
+	en.Ability = &MonsterAbility{Name: "Spell Immunity", Effect: "spell_resist"}
+	if !enemyResistsSpells(&en, st) {
+		t.Error("enemyResistsSpells: should be true from the ability profile alone")
+	}
+	en.Ability = &MonsterAbility{Name: "Draconic Loyalty", Effect: "fear_immune"}
+	if !enemyImmuneToControl(&en, st) {
+		t.Error("enemyImmuneToControl: should be true from the ability profile alone")
+	}
+
+	// ally_buff accumulates but is capped.
+	stB, plB, enB := newState(100, 60)
+	enB.Ability = &MonsterAbility{Name: "Rally", Effect: "ally_buff"}
+	for i := 0; i < 20; i++ {
+		applyAbility(stB, &plB, &enB, phase, res)
+	}
+	if stB.enemyAtkBuff != 15 {
+		t.Errorf("ally_buff: accumulated to %d, want the 15 cap", stB.enemyAtkBuff)
+	}
+	if got := enemyAttackStat(&enB, stB, 1.0); got != enB.Stats.Attack+15 {
+		t.Errorf("enemyAttackStat: got %d, want %d (base + buff)", got, enB.Stats.Attack+15)
+	}
+
+	// reveal_action is consumed by the next player weapon attack.
+	stR, plR, enR := newState(100, 60)
+	stR.enemyRevealNext = true
+	resolvePlayerAttack(stR, &plR, &enR, phase, res)
+	if stR.enemyRevealNext {
+		t.Error("reveal_action: flag should be cleared after the player attack")
+	}
+}
+
+// TestTurnEngine_Multiattack drives a single enemy_turn and confirms a
+// registered multiattack creature resolves one attack roll per profile entry,
+// while an unregistered creature still resolves exactly one.
+func TestTurnEngine_Multiattack(t *testing.T) {
+	countEnemyEvents := func(events []CombatEvent) int {
+		n := 0
+		for _, e := range events {
+			if e.Actor == "enemy" {
+				n++
+			}
+		}
+		return n
+	}
+
+	// Registered: owlbear has a 2-attack profile. Pools are huge so the fight
+	// can't end mid-loop and every swing emits its own enemy event.
+	sess := turnSession(CombatPhaseEnemyTurn, 100000, 100000)
+	sess.EnemyID = "owlbear"
+	player, enemy := basePlayer(), baseEnemy()
+	events, err := stepEngine(sess, &player, &enemy, PlayerAction{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got := countEnemyEvents(events); got != 2 {
+		t.Errorf("owlbear enemy events = %d, want 2 (multiattack profile)", got)
+	}
+
+	// Unregistered: a single attack, as before the upgrade.
+	sess2 := turnSession(CombatPhaseEnemyTurn, 100000, 100000)
+	sess2.EnemyID = "goblin"
+	events2, err := stepEngine(sess2, &player, &enemy, PlayerAction{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got := countEnemyEvents(events2); got != 1 {
+		t.Errorf("goblin enemy events = %d, want 1 (single-attack fallback)", got)
+	}
+}

internal/plugin/bestiary_tuned.go

@@ -0,0 +1,35 @@
+package plugin
+
+// Tuned SRD bestiary — the engine-ready layer derived from the raw staging
+// table.
+//
+// srdStagingBestiary holds verbatim SRD stat blocks, which one-shot gogobee's
+// solo player and are not a drop-in roster (see bestiary_srd_staging.go).
+// tunedBestiarySRD is what the codified tuning pass produces from it: a
+// DnDMonsterTemplate per SRD monster, scaled to the engine's gameplay shape.
+// The formula lives in cmd/open5e-import/tuned.go; regenerate the data with
+// `go run ./cmd/open5e-import gen tuned`.
+//
+// Abilities — the generator classifies each creature's SRD trait names onto an
+// engine MonsterAbility effect (see abilityFromTraits in tuned.go). A creature
+// whose traits are all non-combat (Keen Smell, Amphibious, …) keeps a nil
+// Ability. The Notes field records the raw SRD multiattack/trait text and which
+// ability was wired, so a hand-tuning pass can refine the pick — and since the
+// roster merge below lets hand-authored entries win, refining is just a matter
+// of adding the creature to dndBestiary.
+//
+// File is intentionally NOT dnd_-prefixed (see memory: no new dnd_* identifiers).
+
+var tunedBestiarySRD = buildTunedBestiarySRD()
+
+// Merge the tuned templates into the canonical dndBestiary lookup. Hand-authored
+// roster entries WIN: a tuned entry is only added for an ID the roster doesn't
+// already define, so playtested numbers and wired abilities are never clobbered.
+var _ = func() bool {
+	for id, m := range tunedBestiarySRD {
+		if _, ok := dndBestiary[id]; !ok {
+			dndBestiary[id] = m
+		}
+	}
+	return true
+}()

internal/plugin/bestiary_tuned_data.go

@@ -0,0 +1,340 @@
+// Code generated by cmd/open5e-import. DO NOT EDIT.
+//
+// Source: Open5e SRD monster dump (data/open5e/monsters.json), 5e SRD content
+// under CC-BY-4.0 — see NOTICE. Regenerate with:
+//
+//	go run ./cmd/open5e-import fetch bestiary
+//	go run ./cmd/open5e-import gen tuned
+//
+// Engine-ready DnDMonsterTemplates derived from the raw SRD staging table by
+// the tuning formula in cmd/open5e-import/tuned.go. Hand-authored dndBestiary
+// entries take precedence — see bestiary_tuned.go for the merge.
+
+package plugin
+
+func buildTunedBestiarySRD() map[string]DnDMonsterTemplate {
+	return map[string]DnDMonsterTemplate{
+		"awakened_shrub": {ID: "awakened_shrub", Name: "Awakened Shrub", CR: 0, HP: 10, AC: 10, Attack: 1, AttackBonus: 1, Speed: 8, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: False Appearance"},
+		"baboon": {ID: "baboon", Name: "Baboon", CR: 0, HP: 3, AC: 12, Attack: 1, AttackBonus: 1, Speed: 12, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Pack Tactics"},
+		"badger": {ID: "badger", Name: "Badger", CR: 0, HP: 3, AC: 10, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Smell"},
+		"bat": {ID: "bat", Name: "Bat", CR: 0, HP: 1, AC: 12, Attack: 1, AttackBonus: 0, Speed: 6, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Echolocation, Keen Hearing"},
+		"cat": {ID: "cat", Name: "Cat", CR: 0, HP: 2, AC: 12, Attack: 1, AttackBonus: 0, Speed: 16, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Smell"},
+		"commoner": {ID: "commoner", Name: "Commoner", CR: 0, HP: 4, AC: 10, Attack: 1, AttackBonus: 2, Speed: 12, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"crab": {ID: "crab", Name: "Crab", CR: 0, HP: 2, AC: 11, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amphibious"},
+		"deer": {ID: "deer", Name: "Deer", CR: 0, HP: 4, AC: 13, Attack: 1, AttackBonus: 2, Speed: 18, BlockRate: 0.05, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"eagle": {ID: "eagle", Name: "Eagle", CR: 0, HP: 3, AC: 12, Attack: 1, AttackBonus: 4, Speed: 6, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Sight"},
+		"frog": {ID: "frog", Name: "Frog", CR: 0, HP: 1, AC: 11, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Amphibious, Standing Leap"},
+		"giant_fire_beetle": {ID: "giant_fire_beetle", Name: "Giant Fire Beetle", CR: 0, HP: 4, AC: 13, Attack: 1, AttackBonus: 1, Speed: 12, BlockRate: 0.05, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Illumination"},
+		"goat": {ID: "goat", Name: "Goat", CR: 0, HP: 4, AC: 10, Attack: 1, AttackBonus: 3, Speed: 16, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge, Sure-Footed"},
+		"hawk": {ID: "hawk", Name: "Hawk", CR: 0, HP: 1, AC: 13, Attack: 1, AttackBonus: 0, Speed: 6, BlockRate: 0.05, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Sight"},
+		"homunculus": {ID: "homunculus", Name: "Homunculus", CR: 0, HP: 5, AC: 13, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0.05, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Telepathic Bond"},
+		"hyena": {ID: "hyena", Name: "Hyena", CR: 0, HP: 5, AC: 11, Attack: 1, AttackBonus: 2, Speed: 18, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Pack Tactics"},
+		"jackal": {ID: "jackal", Name: "Jackal", CR: 0, HP: 3, AC: 12, Attack: 1, AttackBonus: 1, Speed: 16, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Hearing and Smell, Pack Tactics"},
+		"lemure": {ID: "lemure", Name: "Lemure", CR: 0, HP: 13, AC: 10, Attack: 1, AttackBonus: 3, Speed: 6, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Regeneration", Phase: "any", ProcChance: 0.5, Effect: "regenerate"}, Notes: "SRD-tuned baseline — Regeneration (regenerate) wired from traits. Traits: Devil's Sight, Hellish Rejuvenation"},
+		"lizard": {ID: "lizard", Name: "Lizard", CR: 0, HP: 2, AC: 10, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"octopus": {ID: "octopus", Name: "Octopus", CR: 0, HP: 3, AC: 12, Attack: 1, AttackBonus: 0, Speed: 6, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Hold Breath, Underwater Camouflage, Water Breathing"},
+		"owl": {ID: "owl", Name: "Owl", CR: 0, HP: 1, AC: 11, Attack: 1, AttackBonus: 0, Speed: 6, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Flyby, Keen Hearing and Sight"},
+		"quipper": {ID: "quipper", Name: "Quipper", CR: 0, HP: 1, AC: 13, Attack: 1, AttackBonus: 0, Speed: 16, BlockRate: 0.05, XPValue: 10, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Blood Frenzy, Water Breathing"},
+		"rat": {ID: "rat", Name: "Rat", CR: 0, HP: 1, AC: 10, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Smell"},
+		"raven": {ID: "raven", Name: "Raven", CR: 0, HP: 1, AC: 12, Attack: 1, AttackBonus: 0, Speed: 6, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Mimicry"},
+		"scorpion": {ID: "scorpion", Name: "Scorpion", CR: 0, HP: 1, AC: 11, Attack: 1, AttackBonus: 0, Speed: 6, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"sea_horse": {ID: "sea_horse", Name: "Sea Horse", CR: 0, HP: 1, AC: 11, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Water Breathing"},
+		"shrieker": {ID: "shrieker", Name: "Shrieker", CR: 0, HP: 13, AC: 10, Attack: 1, AttackBonus: 0, Speed: 10, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: False Appearance"},
+		"spider": {ID: "spider", Name: "Spider", CR: 0, HP: 1, AC: 12, Attack: 1, AttackBonus: 0, Speed: 8, BlockRate: 0, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Spider Climb, Web Sense, Web Walker"},
+		"vulture": {ID: "vulture", Name: "Vulture", CR: 0, HP: 5, AC: 10, Attack: 1, AttackBonus: 2, Speed: 6, BlockRate: 0, XPValue: 10, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Sight and Smell, Pack Tactics"},
+		"weasel": {ID: "weasel", Name: "Weasel", CR: 0, HP: 1, AC: 13, Attack: 1, AttackBonus: 0, Speed: 12, BlockRate: 0.05, XPValue: 10, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Hearing and Smell"},
+		"bandit": {ID: "bandit", Name: "Bandit", CR: 0.125, HP: 11, AC: 12, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"blood_hawk": {ID: "blood_hawk", Name: "Blood Hawk", CR: 0.125, HP: 7, AC: 12, Attack: 1, AttackBonus: 4, Speed: 6, BlockRate: 0, XPValue: 25, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Sight, Pack Tactics"},
+		"camel": {ID: "camel", Name: "Camel", CR: 0.125, HP: 15, AC: 10, Attack: 1, AttackBonus: 5, Speed: 18, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"cultist": {ID: "cultist", Name: "Cultist", CR: 0.125, HP: 9, AC: 12, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Dark Devotion"},
+		"flying_snake": {ID: "flying_snake", Name: "Flying Snake", CR: 0.125, HP: 5, AC: 14, Attack: 1, AttackBonus: 0, Speed: 12, BlockRate: 0.05, XPValue: 25, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Flyby"},
+		"giant_crab": {ID: "giant_crab", Name: "Giant Crab", CR: 0.125, HP: 13, AC: 15, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0.1, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amphibious"},
+		"giant_rat": {ID: "giant_rat", Name: "Giant Rat", CR: 0.125, HP: 7, AC: 12, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 25, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Smell, Pack Tactics"},
+		"giant_rat_diseased": {ID: "giant_rat_diseased", Name: "Giant Rat", CR: 0.125, HP: 7, AC: 12, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"giant_weasel": {ID: "giant_weasel", Name: "Giant Weasel", CR: 0.125, HP: 9, AC: 13, Attack: 1, AttackBonus: 5, Speed: 16, BlockRate: 0.05, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Hearing and Smell"},
+		"guard": {ID: "guard", Name: "Guard", CR: 0.125, HP: 11, AC: 16, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0.1, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"kobold": {ID: "kobold", Name: "Kobold", CR: 0.125, HP: 5, AC: 12, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 25, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Sunlight Sensitivity, Pack Tactics"},
+		"mastiff": {ID: "mastiff", Name: "Mastiff", CR: 0.125, HP: 5, AC: 12, Attack: 1, AttackBonus: 3, Speed: 16, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Hearing and Smell"},
+		"merfolk": {ID: "merfolk", Name: "Merfolk", CR: 0.125, HP: 11, AC: 11, Attack: 1, AttackBonus: 2, Speed: 6, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amphibious"},
+		"mule": {ID: "mule", Name: "Mule", CR: 0.125, HP: 11, AC: 10, Attack: 1, AttackBonus: 4, Speed: 16, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Beast of Burden, Sure-Footed"},
+		"noble": {ID: "noble", Name: "Noble", CR: 0.125, HP: 9, AC: 15, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0.1, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"poisonous_snake": {ID: "poisonous_snake", Name: "Poisonous Snake", CR: 0.125, HP: 2, AC: 13, Attack: 1, AttackBonus: 0, Speed: 12, BlockRate: 0.05, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"pony": {ID: "pony", Name: "Pony", CR: 0.125, HP: 11, AC: 10, Attack: 1, AttackBonus: 4, Speed: 16, BlockRate: 0, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"stirge": {ID: "stirge", Name: "Stirge", CR: 0.125, HP: 2, AC: 14, Attack: 1, AttackBonus: 5, Speed: 6, BlockRate: 0.05, XPValue: 25, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"tribal_warrior": {ID: "tribal_warrior", Name: "Tribal Warrior", CR: 0.125, HP: 11, AC: 12, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 25, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Pack Tactics"},
+		"acolyte": {ID: "acolyte", Name: "Acolyte", CR: 0.25, HP: 9, AC: 10, Attack: 1, AttackBonus: 2, Speed: 12, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Spellcasting"},
+		"axe_beak": {ID: "axe_beak", Name: "Axe Beak", CR: 0.25, HP: 19, AC: 11, Attack: 1, AttackBonus: 4, Speed: 18, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"blink_dog": {ID: "blink_dog", Name: "Blink Dog", CR: 0.25, HP: 22, AC: 13, Attack: 1, AttackBonus: 3, Speed: 16, BlockRate: 0.05, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Hearing and Smell"},
+		"boar": {ID: "boar", Name: "Boar", CR: 0.25, HP: 11, AC: 11, Attack: 1, AttackBonus: 3, Speed: 16, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge, Relentless (Recharges after a Short or Long Rest)"},
+		"constrictor_snake": {ID: "constrictor_snake", Name: "Constrictor Snake", CR: 0.25, HP: 13, AC: 12, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"draft_horse": {ID: "draft_horse", Name: "Draft Horse", CR: 0.25, HP: 19, AC: 10, Attack: 1, AttackBonus: 6, Speed: 16, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"dretch": {ID: "dretch", Name: "Dretch", CR: 0.25, HP: 18, AC: 11, Attack: 1, AttackBonus: 2, Speed: 8, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dretch makes two attacks: one with its bite and one with its claws."},
+		"drow": {ID: "drow", Name: "Drow", CR: 0.25, HP: 13, AC: 15, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0.1, XPValue: 50, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Fey Ancestry, Innate Spellcasting, Sunlight Sensitivity"},
+		"elk": {ID: "elk", Name: "Elk", CR: 0.25, HP: 13, AC: 10, Attack: 1, AttackBonus: 0, Speed: 18, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge"},
+		"flying_sword": {ID: "flying_sword", Name: "Flying Sword", CR: 0.25, HP: 17, AC: 17, Attack: 1, AttackBonus: 3, Speed: 18, BlockRate: 0.1, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Antimagic Susceptibility, False Appearance"},
+		"giant_badger": {ID: "giant_badger", Name: "Giant Badger", CR: 0.25, HP: 13, AC: 10, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The badger makes two attacks: one with its bite and one with its claws. Traits: Keen Smell"},
+		"giant_bat": {ID: "giant_bat", Name: "Giant Bat", CR: 0.25, HP: 22, AC: 13, Attack: 1, AttackBonus: 4, Speed: 6, BlockRate: 0.05, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Echolocation, Keen Hearing"},
+		"giant_centipede": {ID: "giant_centipede", Name: "Giant Centipede", CR: 0.25, HP: 4, AC: 13, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"giant_frog": {ID: "giant_frog", Name: "Giant Frog", CR: 0.25, HP: 18, AC: 11, Attack: 1, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Amphibious, Standing Leap"},
+		"giant_lizard": {ID: "giant_lizard", Name: "Giant Lizard", CR: 0.25, HP: 19, AC: 12, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Variant: Hold Breath, Variant: Spider Climb"},
+		"giant_owl": {ID: "giant_owl", Name: "Giant Owl", CR: 0.25, HP: 19, AC: 12, Attack: 1, AttackBonus: 3, Speed: 6, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Flyby, Keen Hearing and Sight"},
+		"giant_poisonous_snake": {ID: "giant_poisonous_snake", Name: "Giant Poisonous Snake", CR: 0.25, HP: 11, AC: 14, Attack: 1, AttackBonus: 6, Speed: 12, BlockRate: 0.05, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"giant_wolf_spider": {ID: "giant_wolf_spider", Name: "Giant Wolf Spider", CR: 0.25, HP: 11, AC: 13, Attack: 1, AttackBonus: 3, Speed: 16, BlockRate: 0.05, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Spider Climb, Web Sense, Web Walker"},
+		"goblin": {ID: "goblin", Name: "Goblin", CR: 0.25, HP: 7, AC: 15, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0.1, XPValue: 50, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Nimble Escape"},
+		"grimlock": {ID: "grimlock", Name: "Grimlock", CR: 0.25, HP: 11, AC: 11, Attack: 1, AttackBonus: 5, Speed: 12, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Blind Senses, Keen Hearing and Smell, Stone Camouflage"},
+		"panther": {ID: "panther", Name: "Panther", CR: 0.25, HP: 13, AC: 12, Attack: 1, AttackBonus: 4, Speed: 18, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Keen Smell, Pounce"},
+		"pseudodragon": {ID: "pseudodragon", Name: "Pseudodragon", CR: 0.25, HP: 7, AC: 13, Attack: 1, AttackBonus: 4, Speed: 6, BlockRate: 0.05, XPValue: 50, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Traits: Keen Senses, Magic Resistance, Limited Telepathy, Variant: Familiar"},
+		"riding_horse": {ID: "riding_horse", Name: "Riding Horse", CR: 0.25, HP: 13, AC: 10, Attack: 1, AttackBonus: 5, Speed: 18, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"skeleton": {ID: "skeleton", Name: "Skeleton", CR: 0.25, HP: 13, AC: 13, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"sprite": {ID: "sprite", Name: "Sprite", CR: 0.25, HP: 2, AC: 15, Attack: 1, AttackBonus: 0, Speed: 6, BlockRate: 0.1, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"steam_mephit": {ID: "steam_mephit", Name: "Steam Mephit", CR: 0.25, HP: 21, AC: 10, Attack: 1, AttackBonus: 2, Speed: 12, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Traits: Death Burst, Innate Spellcasting (1/Day)"},
+		"swarm_of_bats": {ID: "swarm_of_bats", Name: "Swarm of Bats", CR: 0.25, HP: 22, AC: 12, Attack: 1, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Echolocation, Keen Hearing, Swarm"},
+		"swarm_of_rats": {ID: "swarm_of_rats", Name: "Swarm of Rats", CR: 0.25, HP: 24, AC: 10, Attack: 1, AttackBonus: 2, Speed: 12, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Smell, Swarm"},
+		"swarm_of_ravens": {ID: "swarm_of_ravens", Name: "Swarm of Ravens", CR: 0.25, HP: 24, AC: 12, Attack: 1, AttackBonus: 4, Speed: 6, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Swarm"},
+		"violet_fungus": {ID: "violet_fungus", Name: "Violet Fungus", CR: 0.25, HP: 18, AC: 10, Attack: 1, AttackBonus: 2, Speed: 6, BlockRate: 0, XPValue: 50, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The fungus makes 1d4 Rotting Touch attacks. Traits: False Appearance"},
+		"wolf": {ID: "wolf", Name: "Wolf", CR: 0.25, HP: 11, AC: 13, Attack: 1, AttackBonus: 4, Speed: 16, BlockRate: 0.05, XPValue: 50, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Hearing and Smell, Pack Tactics"},
+		"zombie": {ID: "zombie", Name: "Zombie", CR: 0.25, HP: 22, AC: 10, Attack: 1, AttackBonus: 3, Speed: 8, BlockRate: 0, XPValue: 50, Ability: &MonsterAbility{Name: "Undead Fortitude", Phase: "decisive", ProcChance: 0.5, Effect: "survive_at_1"}, Notes: "SRD-tuned baseline — Undead Fortitude (survive_at_1) wired from traits. Traits: Undead Fortitude"},
+		"ape": {ID: "ape", Name: "Ape", CR: 0.5, HP: 19, AC: 12, Attack: 2, AttackBonus: 5, Speed: 12, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The ape makes two fist attacks."},
+		"black_bear": {ID: "black_bear", Name: "Black Bear", CR: 0.5, HP: 19, AC: 11, Attack: 2, AttackBonus: 3, Speed: 16, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The bear makes two attacks: one with its bite and one with its claws. Traits: Keen Smell"},
+		"cockatrice": {ID: "cockatrice", Name: "Cockatrice", CR: 0.5, HP: 27, AC: 11, Attack: 2, AttackBonus: 3, Speed: 8, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"crocodile": {ID: "crocodile", Name: "Crocodile", CR: 0.5, HP: 19, AC: 12, Attack: 2, AttackBonus: 4, Speed: 8, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Hold Breath"},
+		"darkmantle": {ID: "darkmantle", Name: "Darkmantle", CR: 0.5, HP: 22, AC: 11, Attack: 2, AttackBonus: 5, Speed: 6, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Echolocation, False Appearance"},
+		"deep_gnome_svirfneblin": {ID: "deep_gnome_svirfneblin", Name: "Deep Gnome", CR: 0.5, HP: 16, AC: 15, Attack: 2, AttackBonus: 4, Speed: 8, BlockRate: 0.1, XPValue: 100, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Stone Camouflage, Gnome Cunning, Innate Spellcasting"},
+		"dust_mephit": {ID: "dust_mephit", Name: "Dust Mephit", CR: 0.5, HP: 17, AC: 12, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Traits: Death Burst, Innate Spellcasting (1/Day)"},
+		"giant_goat": {ID: "giant_goat", Name: "Giant Goat", CR: 0.5, HP: 19, AC: 11, Attack: 2, AttackBonus: 5, Speed: 16, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge, Sure-Footed"},
+		"giant_sea_horse": {ID: "giant_sea_horse", Name: "Giant Sea Horse", CR: 0.5, HP: 16, AC: 13, Attack: 2, AttackBonus: 3, Speed: 16, BlockRate: 0.05, XPValue: 100, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge, Water Breathing"},
+		"giant_wasp": {ID: "giant_wasp", Name: "Giant Wasp", CR: 0.5, HP: 13, AC: 12, Attack: 2, AttackBonus: 4, Speed: 6, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"gnoll": {ID: "gnoll", Name: "Gnoll", CR: 0.5, HP: 22, AC: 15, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0.1, XPValue: 100, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Rampage"},
+		"gray_ooze": {ID: "gray_ooze", Name: "Gray Ooze", CR: 0.5, HP: 22, AC: 10, Attack: 2, AttackBonus: 3, Speed: 6, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amorphous, Corrode Metal, False Appearance"},
+		"hobgoblin": {ID: "hobgoblin", Name: "Hobgoblin", CR: 0.5, HP: 11, AC: 18, Attack: 2, AttackBonus: 3, Speed: 12, BlockRate: 0.15, XPValue: 100, Ability: &MonsterAbility{Name: "Martial Advantage", Phase: "any", ProcChance: 0.35, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Martial Advantage (bonus_damage) wired from traits. Traits: Martial Advantage"},
+		"ice_mephit": {ID: "ice_mephit", Name: "Ice Mephit", CR: 0.5, HP: 21, AC: 11, Attack: 2, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Traits: Death Burst, False Appearance, Innate Spellcasting (1/Day)"},
+		"lizardfolk": {ID: "lizardfolk", Name: "Lizardfolk", CR: 0.5, HP: 22, AC: 15, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0.1, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The lizardfolk makes two melee attacks, each one with a different weapon. Traits: Hold Breath"},
+		"magma_mephit": {ID: "magma_mephit", Name: "Magma Mephit", CR: 0.5, HP: 22, AC: 11, Attack: 2, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Traits: Death Burst, False Appearance, Innate Spellcasting (1/Day)"},
+		"magmin": {ID: "magmin", Name: "Magmin", CR: 0.5, HP: 9, AC: 14, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 100, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Traits: Death Burst, Ignited Illumination", FireAttacker: true},
+		"orc": {ID: "orc", Name: "Orc", CR: 0.5, HP: 15, AC: 13, Attack: 2, AttackBonus: 5, Speed: 12, BlockRate: 0.05, XPValue: 100, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Aggressive"},
+		"reef_shark": {ID: "reef_shark", Name: "Reef Shark", CR: 0.5, HP: 22, AC: 12, Attack: 2, AttackBonus: 4, Speed: 16, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Pack Tactics, Water Breathing"},
+		"rust_monster": {ID: "rust_monster", Name: "Rust Monster", CR: 0.5, HP: 27, AC: 14, Attack: 2, AttackBonus: 3, Speed: 16, BlockRate: 0.05, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Iron Scent, Rust Metal"},
+		"sahuagin": {ID: "sahuagin", Name: "Sahuagin", CR: 0.5, HP: 22, AC: 12, Attack: 2, AttackBonus: 3, Speed: 12, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Multiattack: The sahuagin makes two melee attacks: one with its bite and one with its claws or spear. Traits: Blood Frenzy, Limited Amphibiousness, Shark Telepathy"},
+		"satyr": {ID: "satyr", Name: "Satyr", CR: 0.5, HP: 31, AC: 14, Attack: 2, AttackBonus: 3, Speed: 16, BlockRate: 0.05, XPValue: 100, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Traits: Magic Resistance"},
+		"scout": {ID: "scout", Name: "Scout", CR: 0.5, HP: 16, AC: 13, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The scout makes two melee attacks or two ranged attacks. Traits: Keen Hearing and Sight"},
+		"shadow": {ID: "shadow", Name: "Shadow", CR: 0.5, HP: 16, AC: 12, Attack: 2, AttackBonus: 4, Speed: 16, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Surprise Attack", Phase: "opening", ProcChance: 0.8, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Surprise Attack (bonus_damage) wired from traits. Traits: Amorphous, Shadow Stealth, Sunlight Weakness"},
+		"swarm_of_beetles": {ID: "swarm_of_beetles", Name: "Swarm of Beetles", CR: 0.5, HP: 22, AC: 12, Attack: 2, AttackBonus: 3, Speed: 8, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Swarm"},
+		"swarm_of_centipedes": {ID: "swarm_of_centipedes", Name: "Swarm of Centipedes", CR: 0.5, HP: 22, AC: 12, Attack: 2, AttackBonus: 3, Speed: 8, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Swarm"},
+		"swarm_of_insects": {ID: "swarm_of_insects", Name: "Swarm of Insects", CR: 0.5, HP: 22, AC: 12, Attack: 2, AttackBonus: 3, Speed: 8, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Swarm"},
+		"swarm_of_spiders": {ID: "swarm_of_spiders", Name: "Swarm of Spiders", CR: 0.5, HP: 22, AC: 12, Attack: 2, AttackBonus: 3, Speed: 8, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Swarm, Spider Climb, Web Sense, Web Walker"},
+		"swarm_of_wasps": {ID: "swarm_of_wasps", Name: "Swarm of Wasps", CR: 0.5, HP: 22, AC: 12, Attack: 2, AttackBonus: 3, Speed: 6, BlockRate: 0, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Swarm"},
+		"thug": {ID: "thug", Name: "Thug", CR: 0.5, HP: 32, AC: 11, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Multiattack: The thug makes two melee attacks. Traits: Pack Tactics"},
+		"warhorse": {ID: "warhorse", Name: "Warhorse", CR: 0.5, HP: 19, AC: 11, Attack: 2, AttackBonus: 6, Speed: 18, BlockRate: 0, XPValue: 100, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Trampling Charge"},
+		"warhorse_skeleton": {ID: "warhorse_skeleton", Name: "Warhorse Skeleton", CR: 0.5, HP: 22, AC: 13, Attack: 2, AttackBonus: 6, Speed: 18, BlockRate: 0.05, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"worg": {ID: "worg", Name: "Worg", CR: 0.5, HP: 26, AC: 13, Attack: 2, AttackBonus: 5, Speed: 18, BlockRate: 0.05, XPValue: 100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Keen Hearing and Smell"},
+		"animated_armor": {ID: "animated_armor", Name: "Animated Armor", CR: 1, HP: 33, AC: 18, Attack: 2, AttackBonus: 4, Speed: 10, BlockRate: 0.15, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The armor makes two melee attacks. Traits: Antimagic Susceptibility, False Appearance"},
+		"brass_dragon_wyrmling": {ID: "brass_dragon_wyrmling", Name: "Brass Dragon Wyrmling", CR: 1, HP: 16, AC: 16, Attack: 2, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat).", FireAttacker: true},
+		"brown_bear": {ID: "brown_bear", Name: "Brown Bear", CR: 1, HP: 34, AC: 11, Attack: 2, AttackBonus: 5, Speed: 16, BlockRate: 0, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The bear makes two attacks: one with its bite and one with its claws. Traits: Keen Smell"},
+		"bugbear": {ID: "bugbear", Name: "Bugbear", CR: 1, HP: 27, AC: 16, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0.1, XPValue: 200, Ability: &MonsterAbility{Name: "Surprise Attack", Phase: "opening", ProcChance: 0.8, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Surprise Attack (bonus_damage) wired from traits. Traits: Brute, Surprise Attack"},
+		"copper_dragon_wyrmling": {ID: "copper_dragon_wyrmling", Name: "Copper Dragon Wyrmling", CR: 1, HP: 22, AC: 16, Attack: 2, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"death_dog": {ID: "death_dog", Name: "Death Dog", CR: 1, HP: 39, AC: 12, Attack: 2, AttackBonus: 4, Speed: 16, BlockRate: 0, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dog makes two bite attacks. Traits: Two-Headed"},
+		"dire_wolf": {ID: "dire_wolf", Name: "Dire Wolf", CR: 1, HP: 37, AC: 14, Attack: 2, AttackBonus: 5, Speed: 18, BlockRate: 0.05, XPValue: 200, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Hearing and Smell, Pack Tactics"},
+		"dryad": {ID: "dryad", Name: "Dryad", CR: 1, HP: 22, AC: 11, Attack: 2, AttackBonus: 2, Speed: 12, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Innate Spellcasting, Magic Resistance, Speak with Beasts and Plants, Tree Stride"},
+		"duergar": {ID: "duergar", Name: "Duergar", CR: 1, HP: 26, AC: 16, Attack: 2, AttackBonus: 4, Speed: 10, BlockRate: 0.1, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Duergar Resilience, Sunlight Sensitivity"},
+		"ghoul": {ID: "ghoul", Name: "Ghoul", CR: 1, HP: 22, AC: 12, Attack: 2, AttackBonus: 2, Speed: 12, BlockRate: 0, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"giant_eagle": {ID: "giant_eagle", Name: "Giant Eagle", CR: 1, HP: 26, AC: 13, Attack: 2, AttackBonus: 5, Speed: 6, BlockRate: 0.05, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The eagle makes two attacks: one with its beak and one with its talons. Traits: Keen Sight"},
+		"giant_hyena": {ID: "giant_hyena", Name: "Giant Hyena", CR: 1, HP: 45, AC: 12, Attack: 2, AttackBonus: 5, Speed: 18, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Rampage"},
+		"giant_octopus": {ID: "giant_octopus", Name: "Giant Octopus", CR: 1, HP: 52, AC: 11, Attack: 2, AttackBonus: 5, Speed: 6, BlockRate: 0, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Hold Breath, Underwater Camouflage, Water Breathing"},
+		"giant_spider": {ID: "giant_spider", Name: "Giant Spider", CR: 1, HP: 26, AC: 14, Attack: 2, AttackBonus: 5, Speed: 12, BlockRate: 0.05, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Spider Climb, Web Sense, Web Walker"},
+		"giant_toad": {ID: "giant_toad", Name: "Giant Toad", CR: 1, HP: 39, AC: 11, Attack: 2, AttackBonus: 4, Speed: 8, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Amphibious, Standing Leap"},
+		"giant_vulture": {ID: "giant_vulture", Name: "Giant Vulture", CR: 1, HP: 22, AC: 10, Attack: 2, AttackBonus: 4, Speed: 6, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Multiattack: The vulture makes two attacks: one with its beak and one with its talons. Traits: Keen Sight and Smell, Pack Tactics"},
+		"harpy": {ID: "harpy", Name: "Harpy", CR: 1, HP: 38, AC: 11, Attack: 2, AttackBonus: 3, Speed: 8, BlockRate: 0, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The harpy makes two attacks: one with its claws and one with its club."},
+		"hippogriff": {ID: "hippogriff", Name: "Hippogriff", CR: 1, HP: 19, AC: 11, Attack: 2, AttackBonus: 5, Speed: 16, BlockRate: 0, XPValue: 200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The hippogriff makes two attacks: one with its beak and one with its claws. Traits: Keen Sight"},
+		"imp": {ID: "imp", Name: "Imp", CR: 1, HP: 10, AC: 13, Attack: 2, AttackBonus: 5, Speed: 8, BlockRate: 0.05, XPValue: 200, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Traits: Shapechanger, Devil's Sight, Magic Resistance, Variant: Familiar"},
+		"lion": {ID: "lion", Name: "Lion", CR: 1, HP: 26, AC: 12, Attack: 2, AttackBonus: 5, Speed: 18, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Keen Smell, Pack Tactics, Pounce, Running Leap"},
+		"quasit": {ID: "quasit", Name: "Quasit", CR: 1, HP: 7, AC: 13, Attack: 2, AttackBonus: 4, Speed: 16, BlockRate: 0.05, XPValue: 200, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Traits: Shapechanger, Magic Resistance, Variant: Familiar"},
+		"specter": {ID: "specter", Name: "Specter", CR: 1, HP: 22, AC: 12, Attack: 2, AttackBonus: 4, Speed: 18, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Incorporeal Movement, Sunlight Sensitivity"},
+		"spy": {ID: "spy", Name: "Spy", CR: 1, HP: 27, AC: 12, Attack: 2, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Martial Advantage", Phase: "any", ProcChance: 0.35, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Martial Advantage (bonus_damage) wired from traits. Multiattack: The spy makes two melee attacks. Traits: Cunning Action, Sneak Attack (1/Turn)"},
+		"swarm_of_quippers": {ID: "swarm_of_quippers", Name: "Swarm of Quippers", CR: 1, HP: 28, AC: 13, Attack: 2, AttackBonus: 5, Speed: 16, BlockRate: 0.05, XPValue: 200, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Blood Frenzy, Swarm, Water Breathing"},
+		"tiger": {ID: "tiger", Name: "Tiger", CR: 1, HP: 37, AC: 12, Attack: 2, AttackBonus: 5, Speed: 16, BlockRate: 0, XPValue: 200, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Keen Smell, Pounce"},
+		"ankheg": {ID: "ankheg", Name: "Ankheg", CR: 2, HP: 39, AC: 14, Attack: 4, AttackBonus: 0, Speed: 12, BlockRate: 0.05, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"awakened_tree": {ID: "awakened_tree", Name: "Awakened Tree", CR: 2, HP: 59, AC: 13, Attack: 4, AttackBonus: 6, Speed: 8, BlockRate: 0.05, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: False Appearance"},
+		"azer": {ID: "azer", Name: "Azer", CR: 2, HP: 39, AC: 17, Attack: 4, AttackBonus: 5, Speed: 12, BlockRate: 0.1, XPValue: 450, Ability: &MonsterAbility{Name: "Damaging Aura", Phase: "any", ProcChance: 0.4, Effect: "retaliate"}, Notes: "SRD-tuned baseline — Damaging Aura (retaliate) wired from traits. Traits: Heated Body, Heated Weapons, Illumination"},
+		"bandit_captain": {ID: "bandit_captain", Name: "Bandit Captain", CR: 2, HP: 65, AC: 15, Attack: 4, AttackBonus: 5, Speed: 12, BlockRate: 0.1, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The captain makes three melee attacks: two with its scimitar and one with its dagger."},
+		"berserker": {ID: "berserker", Name: "Berserker", CR: 2, HP: 67, AC: 13, Attack: 4, AttackBonus: 5, Speed: 12, BlockRate: 0.05, XPValue: 450, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Reckless"},
+		"black_dragon_wyrmling": {ID: "black_dragon_wyrmling", Name: "Black Dragon Wyrmling", CR: 2, HP: 33, AC: 17, Attack: 4, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amphibious"},
+		"bronze_dragon_wyrmling": {ID: "bronze_dragon_wyrmling", Name: "Bronze Dragon Wyrmling", CR: 2, HP: 32, AC: 17, Attack: 4, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amphibious"},
+		"centaur": {ID: "centaur", Name: "Centaur", CR: 2, HP: 45, AC: 12, Attack: 4, AttackBonus: 6, Speed: 18, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Multiattack: The centaur makes two attacks: one with its pike and one with its hooves or two with its longbow. Traits: Charge"},
+		"cult_fanatic": {ID: "cult_fanatic", Name: "Cult Fanatic", CR: 2, HP: 22, AC: 13, Attack: 4, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 450, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The fanatic makes two melee attacks. Traits: Dark Devotion, Spellcasting"},
+		"druid": {ID: "druid", Name: "Druid", CR: 2, HP: 27, AC: 11, Attack: 4, AttackBonus: 2, Speed: 12, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Spellcasting"},
+		"ettercap": {ID: "ettercap", Name: "Ettercap", CR: 2, HP: 44, AC: 13, Attack: 4, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The ettercap makes two attacks: one with its bite and one with its claws. Traits: Spider Climb, Web Sense, Web Walker"},
+		"gargoyle": {ID: "gargoyle", Name: "Gargoyle", CR: 2, HP: 52, AC: 15, Attack: 4, AttackBonus: 4, Speed: 12, BlockRate: 0.1, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The gargoyle makes two attacks: one with its bite and one with its claws. Traits: False Appearance"},
+		"gelatinous_cube": {ID: "gelatinous_cube", Name: "Gelatinous Cube", CR: 2, HP: 84, AC: 10, Attack: 4, AttackBonus: 4, Speed: 6, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Ooze Cube, Transparent"},
+		"ghast": {ID: "ghast", Name: "Ghast", CR: 2, HP: 36, AC: 13, Attack: 4, AttackBonus: 3, Speed: 12, BlockRate: 0.05, XPValue: 450, Ability: &MonsterAbility{Name: "Damaging Aura", Phase: "any", ProcChance: 0.4, Effect: "retaliate"}, Notes: "SRD-tuned baseline — Damaging Aura (retaliate) wired from traits. Traits: Stench, Turn Defiance"},
+		"giant_boar": {ID: "giant_boar", Name: "Giant Boar", CR: 2, HP: 42, AC: 12, Attack: 4, AttackBonus: 5, Speed: 16, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge, Relentless (Recharges after a Short or Long Rest)"},
+		"giant_constrictor_snake": {ID: "giant_constrictor_snake", Name: "Giant Constrictor Snake", CR: 2, HP: 60, AC: 12, Attack: 4, AttackBonus: 6, Speed: 12, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"giant_elk": {ID: "giant_elk", Name: "Giant Elk", CR: 2, HP: 42, AC: 15, Attack: 4, AttackBonus: 6, Speed: 18, BlockRate: 0.1, XPValue: 450, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge"},
+		"gibbering_mouther": {ID: "gibbering_mouther", Name: "Gibbering Mouther", CR: 2, HP: 67, AC: 10, Attack: 4, AttackBonus: 2, Speed: 6, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The gibbering mouther makes one bite attack and, if it can, uses its Blinding Spittle. Traits: Aberrant Ground, Gibbering"},
+		"green_dragon_wyrmling": {ID: "green_dragon_wyrmling", Name: "Green Dragon Wyrmling", CR: 2, HP: 38, AC: 17, Attack: 4, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amphibious"},
+		"grick": {ID: "grick", Name: "Grick", CR: 2, HP: 27, AC: 14, Attack: 4, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The grick makes one attack with its tentacles. Traits: Stone Camouflage"},
+		"griffon": {ID: "griffon", Name: "Griffon", CR: 2, HP: 59, AC: 12, Attack: 4, AttackBonus: 6, Speed: 12, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The griffon makes two attacks: one with its beak and one with its claws. Traits: Keen Sight"},
+		"hunter_shark": {ID: "hunter_shark", Name: "Hunter Shark", CR: 2, HP: 45, AC: 12, Attack: 4, AttackBonus: 6, Speed: 16, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Blood Frenzy, Water Breathing"},
+		"merrow": {ID: "merrow", Name: "Merrow", CR: 2, HP: 45, AC: 13, Attack: 4, AttackBonus: 6, Speed: 6, BlockRate: 0.05, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The merrow makes two attacks: one with its bite and one with its claws or harpoon. Traits: Amphibious"},
+		"mimic": {ID: "mimic", Name: "Mimic", CR: 2, HP: 58, AC: 12, Attack: 4, AttackBonus: 5, Speed: 6, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Shapechanger, Adhesive (Object Form Only), False Appearance (Object Form Only), Grappler"},
+		"minotaur_skeleton": {ID: "minotaur_skeleton", Name: "Minotaur Skeleton", CR: 2, HP: 67, AC: 12, Attack: 4, AttackBonus: 6, Speed: 16, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge"},
+		"ochre_jelly": {ID: "ochre_jelly", Name: "Ochre Jelly", CR: 2, HP: 45, AC: 10, Attack: 4, AttackBonus: 4, Speed: 6, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amorphous, Spider Climb"},
+		"ogre": {ID: "ogre", Name: "Ogre", CR: 2, HP: 59, AC: 11, Attack: 4, AttackBonus: 6, Speed: 16, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"ogre_zombie": {ID: "ogre_zombie", Name: "Ogre Zombie", CR: 2, HP: 85, AC: 10, Attack: 4, AttackBonus: 6, Speed: 12, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Undead Fortitude", Phase: "decisive", ProcChance: 0.5, Effect: "survive_at_1"}, Notes: "SRD-tuned baseline — Undead Fortitude (survive_at_1) wired from traits. Traits: Undead Fortitude"},
+		"pegasus": {ID: "pegasus", Name: "Pegasus", CR: 2, HP: 59, AC: 12, Attack: 4, AttackBonus: 6, Speed: 18, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"plesiosaurus": {ID: "plesiosaurus", Name: "Plesiosaurus", CR: 2, HP: 68, AC: 13, Attack: 4, AttackBonus: 6, Speed: 8, BlockRate: 0.05, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Hold Breath"},
+		"polar_bear": {ID: "polar_bear", Name: "Polar Bear", CR: 2, HP: 42, AC: 12, Attack: 4, AttackBonus: 7, Speed: 16, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The bear makes two attacks: one with its bite and one with its claws. Traits: Keen Smell"},
+		"priest": {ID: "priest", Name: "Priest", CR: 2, HP: 27, AC: 13, Attack: 4, AttackBonus: 2, Speed: 10, BlockRate: 0.05, XPValue: 450, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Divine Eminence, Spellcasting"},
+		"rhinoceros": {ID: "rhinoceros", Name: "Rhinoceros", CR: 2, HP: 45, AC: 11, Attack: 4, AttackBonus: 7, Speed: 16, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Charge"},
+		"rug_of_smothering": {ID: "rug_of_smothering", Name: "Rug of Smothering", CR: 2, HP: 33, AC: 12, Attack: 4, AttackBonus: 0, Speed: 6, BlockRate: 0, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Antimagic Susceptibility, Damage Transfer, False Appearance"},
+		"saber_toothed_tiger": {ID: "saber_toothed_tiger", Name: "Saber-Toothed Tiger", CR: 2, HP: 52, AC: 12, Attack: 4, AttackBonus: 6, Speed: 16, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Keen Smell, Pounce"},
+		"sea_hag": {ID: "sea_hag", Name: "Sea Hag", CR: 2, HP: 52, AC: 14, Attack: 4, AttackBonus: 5, Speed: 12, BlockRate: 0.05, XPValue: 450, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Amphibious, Horrific Appearance, Hag Coven, Shared Spellcasting (Coven Only), Hag Eye (Coven Only)"},
+		"silver_dragon_wyrmling": {ID: "silver_dragon_wyrmling", Name: "Silver Dragon Wyrmling", CR: 2, HP: 45, AC: 17, Attack: 4, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"swarm_of_poisonous_snakes": {ID: "swarm_of_poisonous_snakes", Name: "Swarm of Poisonous Snakes", CR: 2, HP: 36, AC: 14, Attack: 4, AttackBonus: 6, Speed: 12, BlockRate: 0.05, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Swarm"},
+		"wererat": {ID: "wererat", Name: "Wererat", CR: 2, HP: 33, AC: 12, Attack: 4, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 450, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Shapechanger, Keen Smell"},
+		"white_dragon_wyrmling": {ID: "white_dragon_wyrmling", Name: "White Dragon Wyrmling", CR: 2, HP: 32, AC: 16, Attack: 4, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 450, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"will_o_wisp": {ID: "will_o_wisp", Name: "Will-o'-Wisp", CR: 2, HP: 22, AC: 19, Attack: 4, AttackBonus: 4, Speed: 18, BlockRate: 0.15, XPValue: 450, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Consume Life, Ephemeral, Incorporeal Movement, Variable Illumination"},
+		"basilisk": {ID: "basilisk", Name: "Basilisk", CR: 3, HP: 52, AC: 12, Attack: 6, AttackBonus: 5, Speed: 8, BlockRate: 0, XPValue: 700, Ability: &MonsterAbility{Name: "Frightful Presence", Phase: "opening", ProcChance: 0.4, Effect: "stun"}, Notes: "SRD-tuned baseline — Frightful Presence (stun) wired from traits. Traits: Petrifying Gaze"},
+		"bearded_devil": {ID: "bearded_devil", Name: "Bearded Devil", CR: 3, HP: 52, AC: 13, Attack: 6, AttackBonus: 5, Speed: 12, BlockRate: 0.05, XPValue: 700, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The devil makes two attacks: one with its beard and one with its glaive. Traits: Devil's Sight, Magic Resistance, Steadfast"},
+		"blue_dragon_wyrmling": {ID: "blue_dragon_wyrmling", Name: "Blue Dragon Wyrmling", CR: 3, HP: 52, AC: 17, Attack: 6, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat)."},
+		"doppelganger": {ID: "doppelganger", Name: "Doppelganger", CR: 3, HP: 52, AC: 14, Attack: 6, AttackBonus: 6, Speed: 12, BlockRate: 0.05, XPValue: 700, Ability: &MonsterAbility{Name: "Surprise Attack", Phase: "opening", ProcChance: 0.8, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Surprise Attack (bonus_damage) wired from traits. Multiattack: The doppelganger makes two melee attacks. Traits: Shapechanger, Ambusher, Surprise Attack"},
+		"giant_scorpion": {ID: "giant_scorpion", Name: "Giant Scorpion", CR: 3, HP: 52, AC: 15, Attack: 6, AttackBonus: 4, Speed: 16, BlockRate: 0.1, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The scorpion makes three attacks: two with its claws and one with its sting."},
+		"gold_dragon_wyrmling": {ID: "gold_dragon_wyrmling", Name: "Gold Dragon Wyrmling", CR: 3, HP: 60, AC: 17, Attack: 6, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amphibious", FireAttacker: true},
+		"green_hag": {ID: "green_hag", Name: "Green Hag", CR: 3, HP: 82, AC: 17, Attack: 6, AttackBonus: 6, Speed: 12, BlockRate: 0.1, XPValue: 700, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Amphibious, Innate Spellcasting, Mimicry, Hag Coven, Shared Spellcasting (Coven Only), Hag Eye (Coven Only)"},
+		"hell_hound": {ID: "hell_hound", Name: "Hell Hound", CR: 3, HP: 45, AC: 15, Attack: 6, AttackBonus: 0, Speed: 18, BlockRate: 0.1, XPValue: 700, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Hearing and Smell, Pack Tactics", FireAttacker: true},
+		"killer_whale": {ID: "killer_whale", Name: "Killer Whale", CR: 3, HP: 90, AC: 12, Attack: 6, AttackBonus: 0, Speed: 18, BlockRate: 0, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Echolocation, Hold Breath, Keen Hearing"},
+		"knight": {ID: "knight", Name: "Knight", CR: 3, HP: 52, AC: 18, Attack: 6, AttackBonus: 5, Speed: 12, BlockRate: 0.15, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The knight makes two melee attacks. Traits: Brave"},
+		"manticore": {ID: "manticore", Name: "Manticore", CR: 3, HP: 68, AC: 14, Attack: 6, AttackBonus: 5, Speed: 12, BlockRate: 0.05, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The manticore makes three attacks: one with its bite and two with its claws or three with its tail spikes. Traits: Tail Spike Regrowth"},
+		"minotaur": {ID: "minotaur", Name: "Minotaur", CR: 3, HP: 76, AC: 14, Attack: 6, AttackBonus: 6, Speed: 16, BlockRate: 0.05, XPValue: 700, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Charge, Labyrinthine Recall, Reckless"},
+		"mummy": {ID: "mummy", Name: "Mummy", CR: 3, HP: 58, AC: 11, Attack: 6, AttackBonus: 5, Speed: 8, BlockRate: 0, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The mummy can use its Dreadful Glare and makes one attack with its rotting fist."},
+		"nightmare": {ID: "nightmare", Name: "Nightmare", CR: 3, HP: 68, AC: 13, Attack: 6, AttackBonus: 6, Speed: 18, BlockRate: 0.05, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Confer Fire Resistance, Illumination"},
+		"owlbear": {ID: "owlbear", Name: "Owlbear", CR: 3, HP: 59, AC: 13, Attack: 6, AttackBonus: 7, Speed: 16, BlockRate: 0.05, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The owlbear makes two attacks: one with its beak and one with its claws. Traits: Keen Sight and Smell"},
+		"phase_spider": {ID: "phase_spider", Name: "Phase Spider", CR: 3, HP: 32, AC: 13, Attack: 6, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 700, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Ethereal Jaunt, Spider Climb, Web Walker"},
+		"veteran": {ID: "veteran", Name: "Veteran", CR: 3, HP: 58, AC: 17, Attack: 6, AttackBonus: 5, Speed: 12, BlockRate: 0.1, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The veteran makes two longsword attacks."},
+		"werewolf": {ID: "werewolf", Name: "Werewolf", CR: 3, HP: 58, AC: 11, Attack: 6, AttackBonus: 4, Speed: 12, BlockRate: 0, XPValue: 700, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Shapechanger, Keen Hearing and Smell"},
+		"wight": {ID: "wight", Name: "Wight", CR: 3, HP: 45, AC: 14, Attack: 6, AttackBonus: 4, Speed: 12, BlockRate: 0.05, XPValue: 700, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The wight makes two longsword attacks or two longbow attacks. Traits: Sunlight Sensitivity"},
+		"winter_wolf": {ID: "winter_wolf", Name: "Winter Wolf", CR: 3, HP: 75, AC: 13, Attack: 6, AttackBonus: 0, Speed: 18, BlockRate: 0.05, XPValue: 700, Ability: &MonsterAbility{Name: "Pack Tactics", Phase: "any", ProcChance: 0.3, Effect: "advantage"}, Notes: "SRD-tuned baseline — Pack Tactics (advantage) wired from traits. Traits: Keen Hearing and Smell, Pack Tactics, Snow Camouflage"},
+		"black_pudding": {ID: "black_pudding", Name: "Black Pudding", CR: 4, HP: 85, AC: 10, Attack: 7, AttackBonus: 5, Speed: 8, BlockRate: 0, XPValue: 1100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Traits: Amorphous, Corrosive Form, Spider Climb"},
+		"chuul": {ID: "chuul", Name: "Chuul", CR: 4, HP: 93, AC: 16, Attack: 7, AttackBonus: 6, Speed: 12, BlockRate: 0.1, XPValue: 1100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The chuul makes two pincer attacks. Traits: Amphibious, Sense Magic"},
+		"couatl": {ID: "couatl", Name: "Couatl", CR: 4, HP: 97, AC: 19, Attack: 7, AttackBonus: 6, Speed: 12, BlockRate: 0.15, XPValue: 1100, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Innate Spellcasting, Magic Weapons, Shielded Mind"},
+		"elephant": {ID: "elephant", Name: "Elephant", CR: 4, HP: 76, AC: 12, Attack: 7, AttackBonus: 8, Speed: 16, BlockRate: 0, XPValue: 1100, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Trampling Charge"},
+		"ettin": {ID: "ettin", Name: "Ettin", CR: 4, HP: 85, AC: 12, Attack: 7, AttackBonus: 7, Speed: 16, BlockRate: 0, XPValue: 1100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The ettin makes two attacks: one with its battleaxe and one with its morningstar. Traits: Two Heads, Wakeful"},
+		"ghost": {ID: "ghost", Name: "Ghost", CR: 4, HP: 45, AC: 11, Attack: 7, AttackBonus: 5, Speed: 16, BlockRate: 0, XPValue: 1100, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Ethereal Sight, Incorporeal Movement"},
+		"lamia": {ID: "lamia", Name: "Lamia", CR: 4, HP: 97, AC: 13, Attack: 7, AttackBonus: 5, Speed: 12, BlockRate: 0.05, XPValue: 1100, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The lamia makes two attacks: one with its claws and one with its dagger or Intoxicating Touch. Traits: Innate Spellcasting"},
+		"red_dragon_wyrmling": {ID: "red_dragon_wyrmling", Name: "Red Dragon Wyrmling", CR: 4, HP: 75, AC: 17, Attack: 7, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 1100, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat).", FireAttacker: true},
+		"succubusincubus": {ID: "succubusincubus", Name: "Succubus/Incubus", CR: 4, HP: 66, AC: 15, Attack: 7, AttackBonus: 0, Speed: 12, BlockRate: 0.1, XPValue: 1100, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Telepathic Bond, Shapechanger"},
+		"wereboar": {ID: "wereboar", Name: "Wereboar", CR: 4, HP: 78, AC: 10, Attack: 7, AttackBonus: 5, Speed: 12, BlockRate: 0, XPValue: 1100, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Shapechanger, Charge (Boar or Hybrid Form Only), Relentless (Recharges after a Short or Long Rest)"},
+		"weretiger": {ID: "weretiger", Name: "Weretiger", CR: 4, HP: 120, AC: 12, Attack: 7, AttackBonus: 5, Speed: 12, BlockRate: 0, XPValue: 1100, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Shapechanger, Keen Hearing and Smell, Pounce (Tiger or Hybrid Form Only)"},
+		"air_elemental": {ID: "air_elemental", Name: "Air Elemental", CR: 5, HP: 90, AC: 15, Attack: 8, AttackBonus: 8, Speed: 18, BlockRate: 0.1, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The elemental makes two slam attacks. Traits: Air Form"},
+		"barbed_devil": {ID: "barbed_devil", Name: "Barbed Devil", CR: 5, HP: 110, AC: 15, Attack: 8, AttackBonus: 6, Speed: 12, BlockRate: 0.1, XPValue: 1800, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The devil makes three melee attacks: one with its tail and two with its claws. Traits: Barbed Hide, Devil's Sight, Magic Resistance"},
+		"bulette": {ID: "bulette", Name: "Bulette", CR: 5, HP: 94, AC: 17, Attack: 8, AttackBonus: 7, Speed: 16, BlockRate: 0.1, XPValue: 1800, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Standing Leap"},
+		"earth_elemental": {ID: "earth_elemental", Name: "Earth Elemental", CR: 5, HP: 126, AC: 17, Attack: 8, AttackBonus: 8, Speed: 12, BlockRate: 0.1, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The elemental makes two slam attacks. Traits: Earth Glide, Siege Monster"},
+		"fire_elemental": {ID: "fire_elemental", Name: "Fire Elemental", CR: 5, HP: 102, AC: 13, Attack: 8, AttackBonus: 6, Speed: 18, BlockRate: 0.05, XPValue: 1800, Ability: &MonsterAbility{Name: "Damaging Aura", Phase: "any", ProcChance: 0.4, Effect: "retaliate"}, Notes: "SRD-tuned baseline — Damaging Aura (retaliate) wired from traits. Multiattack: The elemental makes two touch attacks. Traits: Fire Form, Illumination, Water Susceptibility", FireAttacker: true},
+		"flesh_golem": {ID: "flesh_golem", Name: "Flesh Golem", CR: 5, HP: 93, AC: 10, Attack: 8, AttackBonus: 7, Speed: 12, BlockRate: 0, XPValue: 1800, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The golem makes two slam attacks. Traits: Berserk, Aversion of Fire, Immutable Form, Lightning Absorption, Magic Resistance, Magic Weapons"},
+		"giant_crocodile": {ID: "giant_crocodile", Name: "Giant Crocodile", CR: 5, HP: 85, AC: 14, Attack: 8, AttackBonus: 8, Speed: 12, BlockRate: 0.05, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The crocodile makes two attacks: one with its bite and one with its tail. Traits: Hold Breath"},
+		"giant_shark": {ID: "giant_shark", Name: "Giant Shark", CR: 5, HP: 126, AC: 13, Attack: 8, AttackBonus: 9, Speed: 18, BlockRate: 0.05, XPValue: 1800, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Traits: Blood Frenzy, Water Breathing"},
+		"gladiator": {ID: "gladiator", Name: "Gladiator", CR: 5, HP: 112, AC: 16, Attack: 8, AttackBonus: 7, Speed: 12, BlockRate: 0.1, XPValue: 1800, Ability: &MonsterAbility{Name: "Frenzy", Phase: "any", ProcChance: 0.4, Effect: "enrage"}, Notes: "SRD-tuned baseline — Frenzy (enrage) wired from traits. Multiattack: The gladiator makes three melee attacks or two ranged attacks. Traits: Brave, Brute"},
+		"gorgon": {ID: "gorgon", Name: "Gorgon", CR: 5, HP: 114, AC: 19, Attack: 8, AttackBonus: 8, Speed: 16, BlockRate: 0.15, XPValue: 1800, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Trampling Charge"},
+		"half_red_dragon_veteran": {ID: "half_red_dragon_veteran", Name: "Half-Red Dragon Veteran", CR: 5, HP: 65, AC: 18, Attack: 8, AttackBonus: 0, Speed: 12, BlockRate: 0.15, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The veteran makes two longsword attacks.", FireAttacker: true},
+		"hill_giant": {ID: "hill_giant", Name: "Hill Giant", CR: 5, HP: 105, AC: 13, Attack: 8, AttackBonus: 8, Speed: 16, BlockRate: 0.05, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The giant makes two greatclub attacks."},
+		"night_hag": {ID: "night_hag", Name: "Night Hag", CR: 5, HP: 112, AC: 17, Attack: 8, AttackBonus: 7, Speed: 12, BlockRate: 0.1, XPValue: 1800, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Innate Spellcasting, Magic Resistance, Night Hag Items, Hag Coven, Shared Spellcasting (Coven Only), Hag Eye (Coven Only)"},
+		"otyugh": {ID: "otyugh", Name: "Otyugh", CR: 5, HP: 114, AC: 14, Attack: 8, AttackBonus: 6, Speed: 12, BlockRate: 0.05, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The otyugh makes three attacks: one with its bite and two with its tentacles. Traits: Limited Telepathy"},
+		"roper": {ID: "roper", Name: "Roper", CR: 5, HP: 93, AC: 20, Attack: 8, AttackBonus: 7, Speed: 6, BlockRate: 0.15, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The roper makes four attacks with its tendrils, uses Reel, and makes one attack with its bite. Traits: False Appearance, Grasping Tendrils, Spider Climb"},
+		"salamander": {ID: "salamander", Name: "Salamander", CR: 5, HP: 90, AC: 15, Attack: 8, AttackBonus: 7, Speed: 12, BlockRate: 0.1, XPValue: 1800, Ability: &MonsterAbility{Name: "Damaging Aura", Phase: "any", ProcChance: 0.4, Effect: "retaliate"}, Notes: "SRD-tuned baseline — Damaging Aura (retaliate) wired from traits. Multiattack: The salamander makes two attacks: one with its spear and one with its tail. Traits: Heated Body, Heated Weapons"},
+		"shambling_mound": {ID: "shambling_mound", Name: "Shambling Mound", CR: 5, HP: 136, AC: 15, Attack: 8, AttackBonus: 7, Speed: 8, BlockRate: 0.1, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The shambling mound makes two slam attacks. Traits: Lightning Absorption"},
+		"triceratops": {ID: "triceratops", Name: "Triceratops", CR: 5, HP: 95, AC: 13, Attack: 8, AttackBonus: 9, Speed: 18, BlockRate: 0.05, XPValue: 1800, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Trampling Charge"},
+		"troll": {ID: "troll", Name: "Troll", CR: 5, HP: 84, AC: 15, Attack: 8, AttackBonus: 7, Speed: 12, BlockRate: 0.1, XPValue: 1800, Ability: &MonsterAbility{Name: "Regeneration", Phase: "any", ProcChance: 0.5, Effect: "regenerate"}, Notes: "SRD-tuned baseline — Regeneration (regenerate) wired from traits. Multiattack: The troll makes three attacks: one with its bite and two with its claws. Traits: Keen Smell, Regeneration, Variant: Loathsome Limbs"},
+		"unicorn": {ID: "unicorn", Name: "Unicorn", CR: 5, HP: 67, AC: 12, Attack: 8, AttackBonus: 7, Speed: 18, BlockRate: 0, XPValue: 1800, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The unicorn makes two attacks: one with its hooves and one with its horn. Traits: Charge, Innate Spellcasting, Magic Resistance, Magic Weapons"},
+		"vampire_spawn": {ID: "vampire_spawn", Name: "Vampire Spawn", CR: 5, HP: 82, AC: 15, Attack: 8, AttackBonus: 6, Speed: 12, BlockRate: 0.1, XPValue: 1800, Ability: &MonsterAbility{Name: "Regeneration", Phase: "any", ProcChance: 0.5, Effect: "regenerate"}, Notes: "SRD-tuned baseline — Regeneration (regenerate) wired from traits. Multiattack: The vampire makes two attacks, only one of which can be a bite attack. Traits: Regeneration, Spider Climb, Vampire Weaknesses"},
+		"water_elemental": {ID: "water_elemental", Name: "Water Elemental", CR: 5, HP: 114, AC: 14, Attack: 8, AttackBonus: 7, Speed: 12, BlockRate: 0.05, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The elemental makes two slam attacks. Traits: Water Form, Freeze"},
+		"werebear": {ID: "werebear", Name: "Werebear", CR: 5, HP: 135, AC: 10, Attack: 8, AttackBonus: 7, Speed: 12, BlockRate: 0, XPValue: 1800, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Multiattack: In bear form, the werebear makes two claw attacks. Traits: Shapechanger, Keen Smell"},
+		"wraith": {ID: "wraith", Name: "Wraith", CR: 5, HP: 67, AC: 13, Attack: 8, AttackBonus: 6, Speed: 18, BlockRate: 0.05, XPValue: 1800, Ability: &MonsterAbility{Name: "Evasive", Phase: "any", ProcChance: 0.3, Effect: "evade"}, Notes: "SRD-tuned baseline — Evasive (evade) wired from traits. Traits: Incorporeal Movement, Sunlight Sensitivity"},
+		"xorn": {ID: "xorn", Name: "Xorn", CR: 5, HP: 73, AC: 19, Attack: 8, AttackBonus: 6, Speed: 8, BlockRate: 0.15, XPValue: 1800, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The xorn makes three claw attacks and one bite attack. Traits: Earth Glide, Stone Camouflage, Treasure Sense"},
+		"chimera": {ID: "chimera", Name: "Chimera", CR: 6, HP: 114, AC: 14, Attack: 10, AttackBonus: 0, Speed: 12, BlockRate: 0.05, XPValue: 2300, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The chimera makes three attacks: one with its bite, one with its horns, and one with its claws.", FireAttacker: true},
+		"drider": {ID: "drider", Name: "Drider", CR: 6, HP: 123, AC: 19, Attack: 10, AttackBonus: 6, Speed: 12, BlockRate: 0.15, XPValue: 2300, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The drider makes three attacks, either with its longsword or its longbow. Traits: Fey Ancestry, Innate Spellcasting, Spider Climb, Sunlight Sensitivity, Web Walker"},
+		"invisible_stalker": {ID: "invisible_stalker", Name: "Invisible Stalker", CR: 6, HP: 104, AC: 14, Attack: 10, AttackBonus: 6, Speed: 18, BlockRate: 0.05, XPValue: 2300, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The stalker makes two slam attacks. Traits: Invisibility, Faultless Tracker"},
+		"mage": {ID: "mage", Name: "Mage", CR: 6, HP: 40, AC: 12, Attack: 10, AttackBonus: 5, Speed: 12, BlockRate: 0, XPValue: 2300, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Spellcasting"},
+		"mammoth": {ID: "mammoth", Name: "Mammoth", CR: 6, HP: 126, AC: 13, Attack: 10, AttackBonus: 10, Speed: 16, BlockRate: 0.05, XPValue: 2300, Ability: &MonsterAbility{Name: "Charge", Phase: "opening", ProcChance: 0.4, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Charge (bonus_damage) wired from traits. Traits: Trampling Charge"},
+		"medusa": {ID: "medusa", Name: "Medusa", CR: 6, HP: 127, AC: 15, Attack: 10, AttackBonus: 5, Speed: 12, BlockRate: 0.1, XPValue: 2300, Ability: &MonsterAbility{Name: "Frightful Presence", Phase: "opening", ProcChance: 0.4, Effect: "stun"}, Notes: "SRD-tuned baseline — Frightful Presence (stun) wired from traits. Multiattack: The medusa makes either three melee attacks - one with its snake hair and two with its shortsword - or two ranged attacks with its longbow. Traits: Petrifying Gaze"},
+		"vrock": {ID: "vrock", Name: "Vrock", CR: 6, HP: 104, AC: 15, Attack: 10, AttackBonus: 6, Speed: 16, BlockRate: 0.1, XPValue: 2300, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The vrock makes two attacks: one with its beak and one with its talons. Traits: Magic Resistance"},
+		"wyvern": {ID: "wyvern", Name: "Wyvern", CR: 6, HP: 110, AC: 13, Attack: 10, AttackBonus: 7, Speed: 8, BlockRate: 0.05, XPValue: 2300, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The wyvern makes two attacks: one with its bite and one with its stinger."},
+		"young_brass_dragon": {ID: "young_brass_dragon", Name: "Young Brass Dragon", CR: 6, HP: 110, AC: 17, Attack: 10, AttackBonus: 0, Speed: 16, BlockRate: 0.1, XPValue: 2300, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws.", FireAttacker: true},
+		"young_white_dragon": {ID: "young_white_dragon", Name: "Young White Dragon", CR: 6, HP: 133, AC: 17, Attack: 10, AttackBonus: 0, Speed: 16, BlockRate: 0.1, XPValue: 2300, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws. Traits: Ice Walk"},
+		"giant_ape": {ID: "giant_ape", Name: "Giant Ape", CR: 7, HP: 157, AC: 12, Attack: 12, AttackBonus: 9, Speed: 16, BlockRate: 0, XPValue: 2900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The ape makes two fist attacks."},
+		"oni": {ID: "oni", Name: "Oni", CR: 7, HP: 110, AC: 16, Attack: 12, AttackBonus: 7, Speed: 12, BlockRate: 0.1, XPValue: 2900, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The oni makes two attacks, either with its claws or its glaive. Traits: Innate Spellcasting, Magic Weapons, Regeneration"},
+		"shield_guardian": {ID: "shield_guardian", Name: "Shield Guardian", CR: 7, HP: 142, AC: 17, Attack: 12, AttackBonus: 7, Speed: 12, BlockRate: 0.1, XPValue: 2900, Ability: &MonsterAbility{Name: "Regeneration", Phase: "any", ProcChance: 0.5, Effect: "regenerate"}, Notes: "SRD-tuned baseline — Regeneration (regenerate) wired from traits. Multiattack: The guardian makes two fist attacks. Traits: Bound, Regeneration, Spell Storing"},
+		"stone_giant": {ID: "stone_giant", Name: "Stone Giant", CR: 7, HP: 126, AC: 17, Attack: 12, AttackBonus: 9, Speed: 16, BlockRate: 0.1, XPValue: 2900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The giant makes two greatclub attacks. Traits: Stone Camouflage"},
+		"young_black_dragon": {ID: "young_black_dragon", Name: "Young Black Dragon", CR: 7, HP: 127, AC: 18, Attack: 12, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 2900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws. Traits: Amphibious"},
+		"young_copper_dragon": {ID: "young_copper_dragon", Name: "Young Copper Dragon", CR: 7, HP: 119, AC: 17, Attack: 12, AttackBonus: 0, Speed: 16, BlockRate: 0.1, XPValue: 2900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws."},
+		"assassin": {ID: "assassin", Name: "Assassin", CR: 8, HP: 78, AC: 15, Attack: 13, AttackBonus: 6, Speed: 12, BlockRate: 0.1, XPValue: 3900, Ability: &MonsterAbility{Name: "Surprise Attack", Phase: "opening", ProcChance: 0.8, Effect: "bonus_damage"}, Notes: "SRD-tuned baseline — Surprise Attack (bonus_damage) wired from traits. Multiattack: The assassin makes two shortsword attacks. Traits: Assassinate, Evasion, Sneak Attack (1/Turn)"},
+		"cloaker": {ID: "cloaker", Name: "Cloaker", CR: 8, HP: 78, AC: 14, Attack: 13, AttackBonus: 6, Speed: 6, BlockRate: 0.05, XPValue: 3900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The cloaker makes two attacks: one with its bite and one with its tail. Traits: Damage Transfer, False Appearance, Light Sensitivity"},
+		"frost_giant": {ID: "frost_giant", Name: "Frost Giant", CR: 8, HP: 138, AC: 15, Attack: 13, AttackBonus: 9, Speed: 16, BlockRate: 0.1, XPValue: 3900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The giant makes two greataxe attacks."},
+		"hezrou": {ID: "hezrou", Name: "Hezrou", CR: 8, HP: 136, AC: 16, Attack: 13, AttackBonus: 7, Speed: 12, BlockRate: 0.1, XPValue: 3900, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The hezrou makes three attacks: one with its bite and two with its claws. Traits: Magic Resistance, Stench"},
+		"hydra": {ID: "hydra", Name: "Hydra", CR: 8, HP: 172, AC: 15, Attack: 13, AttackBonus: 8, Speed: 12, BlockRate: 0.1, XPValue: 3900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The hydra makes as many bite attacks as it has heads. Traits: Hold Breath, Multiple Heads, Reactive Heads, Wakeful"},
+		"spirit_naga": {ID: "spirit_naga", Name: "Spirit Naga", CR: 8, HP: 75, AC: 15, Attack: 13, AttackBonus: 7, Speed: 16, BlockRate: 0.1, XPValue: 3900, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Rejuvenation, Spellcasting"},
+		"tyrannosaurus_rex": {ID: "tyrannosaurus_rex", Name: "Tyrannosaurus Rex", CR: 8, HP: 136, AC: 13, Attack: 13, AttackBonus: 10, Speed: 18, BlockRate: 0.05, XPValue: 3900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The tyrannosaurus makes two attacks: one with its bite and one with its tail."},
+		"young_bronze_dragon": {ID: "young_bronze_dragon", Name: "Young Bronze Dragon", CR: 8, HP: 142, AC: 18, Attack: 13, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 3900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws. Traits: Amphibious"},
+		"young_green_dragon": {ID: "young_green_dragon", Name: "Young Green Dragon", CR: 8, HP: 136, AC: 18, Attack: 13, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 3900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws. Traits: Amphibious"},
+		"bone_devil": {ID: "bone_devil", Name: "Bone Devil", CR: 9, HP: 142, AC: 19, Attack: 14, AttackBonus: 8, Speed: 16, BlockRate: 0.15, XPValue: 5000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The devil makes three attacks: two with its claws and one with its sting. Traits: Devil's Sight, Magic Resistance"},
+		"clay_golem": {ID: "clay_golem", Name: "Clay Golem", CR: 9, HP: 133, AC: 14, Attack: 14, AttackBonus: 8, Speed: 8, BlockRate: 0.05, XPValue: 5000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The golem makes two slam attacks. Traits: Acid Absorption, Berserk, Immutable Form, Magic Resistance, Magic Weapons"},
+		"cloud_giant": {ID: "cloud_giant", Name: "Cloud Giant", CR: 9, HP: 200, AC: 14, Attack: 14, AttackBonus: 12, Speed: 16, BlockRate: 0.05, XPValue: 5000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The giant makes two morningstar attacks. Traits: Keen Smell, Innate Spellcasting"},
+		"fire_giant": {ID: "fire_giant", Name: "Fire Giant", CR: 9, HP: 162, AC: 18, Attack: 14, AttackBonus: 11, Speed: 12, BlockRate: 0.15, XPValue: 5000, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The giant makes two greatsword attacks."},
+		"glabrezu": {ID: "glabrezu", Name: "Glabrezu", CR: 9, HP: 157, AC: 17, Attack: 14, AttackBonus: 9, Speed: 16, BlockRate: 0.1, XPValue: 5000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The glabrezu makes four attacks: two with its pincers and two with its fists. Traits: Innate Spellcasting, Magic Resistance"},
+		"treant": {ID: "treant", Name: "Treant", CR: 9, HP: 138, AC: 16, Attack: 14, AttackBonus: 10, Speed: 12, BlockRate: 0.1, XPValue: 5000, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The treant makes two slam attacks. Traits: False Appearance, Siege Monster"},
+		"young_blue_dragon": {ID: "young_blue_dragon", Name: "Young Blue Dragon", CR: 9, HP: 152, AC: 18, Attack: 14, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 5000, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws."},
+		"young_silver_dragon": {ID: "young_silver_dragon", Name: "Young Silver Dragon", CR: 9, HP: 168, AC: 18, Attack: 14, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 5000, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws."},
+		"aboleth": {ID: "aboleth", Name: "Aboleth", CR: 10, HP: 135, AC: 17, Attack: 16, AttackBonus: 9, Speed: 6, BlockRate: 0.1, XPValue: 5900, Ability: &MonsterAbility{Name: "Damaging Aura", Phase: "any", ProcChance: 0.4, Effect: "retaliate"}, Notes: "SRD-tuned baseline — Damaging Aura (retaliate) wired from traits. Multiattack: The aboleth makes three tentacle attacks. Traits: Amphibious, Mucous Cloud, Probing Telepathy"},
+		"deva": {ID: "deva", Name: "Deva", CR: 10, HP: 136, AC: 17, Attack: 16, AttackBonus: 8, Speed: 12, BlockRate: 0.1, XPValue: 5900, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The deva makes two melee attacks. Traits: Angelic Weapons, Innate Spellcasting, Magic Resistance"},
+		"guardian_naga": {ID: "guardian_naga", Name: "Guardian Naga", CR: 10, HP: 127, AC: 18, Attack: 16, AttackBonus: 8, Speed: 16, BlockRate: 0.15, XPValue: 5900, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Rejuvenation, Spellcasting"},
+		"stone_golem": {ID: "stone_golem", Name: "Stone Golem", CR: 10, HP: 178, AC: 17, Attack: 16, AttackBonus: 10, Speed: 12, BlockRate: 0.1, XPValue: 5900, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The golem makes two slam attacks. Traits: Immutable Form, Magic Resistance, Magic Weapons"},
+		"young_gold_dragon": {ID: "young_gold_dragon", Name: "Young Gold Dragon", CR: 10, HP: 178, AC: 18, Attack: 16, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 5900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws. Traits: Amphibious", FireAttacker: true},
+		"young_red_dragon": {ID: "young_red_dragon", Name: "Young Red Dragon", CR: 10, HP: 178, AC: 18, Attack: 16, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 5900, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon makes three attacks: one with its bite and two with its claws.", FireAttacker: true},
+		"behir": {ID: "behir", Name: "Behir", CR: 11, HP: 168, AC: 17, Attack: 18, AttackBonus: 0, Speed: 18, BlockRate: 0.1, XPValue: 7200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The behir makes two attacks: one with its bite and one to constrict."},
+		"chain_devil": {ID: "chain_devil", Name: "Chain Devil", CR: 11, HP: 85, AC: 16, Attack: 18, AttackBonus: 8, Speed: 12, BlockRate: 0.1, XPValue: 7200, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The devil makes two attacks with its chains. Traits: Devil's Sight, Magic Resistance"},
+		"djinni": {ID: "djinni", Name: "Djinni", CR: 11, HP: 161, AC: 17, Attack: 18, AttackBonus: 9, Speed: 12, BlockRate: 0.1, XPValue: 7200, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Multiattack: The djinni makes three scimitar attacks. Traits: Elemental Demise, Innate Spellcasting, Variant: Genie Powers"},
+		"efreeti": {ID: "efreeti", Name: "Efreeti", CR: 11, HP: 200, AC: 17, Attack: 18, AttackBonus: 7, Speed: 16, BlockRate: 0.1, XPValue: 7200, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Multiattack: The efreeti makes two scimitar attacks or uses its Hurl Flame twice. Traits: Elemental Demise, Innate Spellcasting, Variant: Genie Powers", FireAttacker: true},
+		"gynosphinx": {ID: "gynosphinx", Name: "Gynosphinx", CR: 11, HP: 136, AC: 17, Attack: 18, AttackBonus: 9, Speed: 16, BlockRate: 0.1, XPValue: 7200, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The sphinx makes two claw attacks. Traits: Inscrutable, Magic Weapons, Spellcasting"},
+		"horned_devil": {ID: "horned_devil", Name: "Horned Devil", CR: 11, HP: 178, AC: 18, Attack: 18, AttackBonus: 10, Speed: 8, BlockRate: 0.15, XPValue: 7200, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The devil makes three melee attacks: two with its fork and one with its tail. Traits: Devil's Sight, Magic Resistance"},
+		"remorhaz": {ID: "remorhaz", Name: "Remorhaz", CR: 11, HP: 195, AC: 17, Attack: 18, AttackBonus: 11, Speed: 12, BlockRate: 0.1, XPValue: 7200, Ability: &MonsterAbility{Name: "Damaging Aura", Phase: "any", ProcChance: 0.4, Effect: "retaliate"}, Notes: "SRD-tuned baseline — Damaging Aura (retaliate) wired from traits. Traits: Heated Body"},
+		"roc": {ID: "roc", Name: "Roc", CR: 11, HP: 248, AC: 15, Attack: 18, AttackBonus: 13, Speed: 8, BlockRate: 0.1, XPValue: 7200, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The roc makes two attacks: one with its beak and one with its talons. Traits: Keen Sight"},
+		"archmage": {ID: "archmage", Name: "Archmage", CR: 12, HP: 99, AC: 12, Attack: 19, AttackBonus: 6, Speed: 12, BlockRate: 0, XPValue: 8400, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Magic Resistance, Spellcasting"},
+		"erinyes": {ID: "erinyes", Name: "Erinyes", CR: 12, HP: 153, AC: 18, Attack: 19, AttackBonus: 8, Speed: 12, BlockRate: 0.15, XPValue: 8400, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The erinyes makes three attacks Traits: Hellish Weapons, Magic Resistance"},
+		"adult_brass_dragon": {ID: "adult_brass_dragon", Name: "Adult Brass Dragon", CR: 13, HP: 172, AC: 18, Attack: 21, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 10000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)", FireAttacker: true},
+		"adult_white_dragon": {ID: "adult_white_dragon", Name: "Adult White Dragon", CR: 13, HP: 200, AC: 18, Attack: 21, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 10000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Ice Walk, Legendary Resistance (3/Day)"},
+		"nalfeshnee": {ID: "nalfeshnee", Name: "Nalfeshnee", CR: 13, HP: 184, AC: 18, Attack: 21, AttackBonus: 10, Speed: 8, BlockRate: 0.15, XPValue: 10000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The nalfeshnee uses Horror Nimbus if it can. Traits: Magic Resistance"},
+		"rakshasa": {ID: "rakshasa", Name: "Rakshasa", CR: 13, HP: 110, AC: 16, Attack: 21, AttackBonus: 7, Speed: 16, BlockRate: 0.1, XPValue: 10000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The rakshasa makes two claw attacks Traits: Limited Magic Immunity, Innate Spellcasting"},
+		"storm_giant": {ID: "storm_giant", Name: "Storm Giant", CR: 13, HP: 230, AC: 16, Attack: 21, AttackBonus: 0, Speed: 18, BlockRate: 0.1, XPValue: 10000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The giant makes two greatsword attacks. Traits: Amphibious, Innate Spellcasting"},
+		"vampire": {ID: "vampire", Name: "Vampire", CR: 13, HP: 144, AC: 16, Attack: 21, AttackBonus: 9, Speed: 12, BlockRate: 0.1, XPValue: 10000, Ability: &MonsterAbility{Name: "Regeneration", Phase: "any", ProcChance: 0.5, Effect: "regenerate"}, Notes: "SRD-tuned baseline — Regeneration (regenerate) wired from traits. Traits: Shapechanger, Legendary Resistance (3/Day), Misty Escape, Regeneration, Spider Climb, Vampire Weaknesses"},
+		"adult_black_dragon": {ID: "adult_black_dragon", Name: "Adult Black Dragon", CR: 14, HP: 195, AC: 19, Attack: 23, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 11500, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)"},
+		"adult_copper_dragon": {ID: "adult_copper_dragon", Name: "Adult Copper Dragon", CR: 14, HP: 184, AC: 18, Attack: 23, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 11500, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)"},
+		"ice_devil": {ID: "ice_devil", Name: "Ice Devil", CR: 14, HP: 180, AC: 18, Attack: 23, AttackBonus: 10, Speed: 16, BlockRate: 0.15, XPValue: 11500, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The devil makes three attacks: one with its bite, one with its claws, and one with its tail. Traits: Devil's Sight, Magic Resistance"},
+		"adult_bronze_dragon": {ID: "adult_bronze_dragon", Name: "Adult Bronze Dragon", CR: 15, HP: 212, AC: 19, Attack: 24, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 13000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)"},
+		"adult_green_dragon": {ID: "adult_green_dragon", Name: "Adult Green Dragon", CR: 15, HP: 207, AC: 19, Attack: 24, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 13000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)"},
+		"mummy_lord": {ID: "mummy_lord", Name: "Mummy Lord", CR: 15, HP: 97, AC: 17, Attack: 24, AttackBonus: 9, Speed: 8, BlockRate: 0.1, XPValue: 13000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The mummy can use its Dreadful Glare and makes one attack with its rotting fist. Traits: Magic Resistance, Rejuvenation, Spellcasting"},
+		"purple_worm": {ID: "purple_worm", Name: "Purple Worm", CR: 15, HP: 247, AC: 18, Attack: 24, AttackBonus: 9, Speed: 18, BlockRate: 0.15, XPValue: 13000, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The worm makes two attacks: one with its bite and one with its stinger. Traits: Tunneler"},
+		"adult_blue_dragon": {ID: "adult_blue_dragon", Name: "Adult Blue Dragon", CR: 16, HP: 225, AC: 19, Attack: 26, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 15000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)"},
+		"adult_silver_dragon": {ID: "adult_silver_dragon", Name: "Adult Silver Dragon", CR: 16, HP: 243, AC: 19, Attack: 26, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 15000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)"},
+		"iron_golem": {ID: "iron_golem", Name: "Iron Golem", CR: 16, HP: 210, AC: 20, Attack: 26, AttackBonus: 0, Speed: 12, BlockRate: 0.15, XPValue: 15000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The golem makes two melee attacks. Traits: Fire Absorption, Immutable Form, Magic Resistance, Magic Weapons"},
+		"marilith": {ID: "marilith", Name: "Marilith", CR: 16, HP: 189, AC: 18, Attack: 26, AttackBonus: 9, Speed: 16, BlockRate: 0.15, XPValue: 15000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The marilith can make seven attacks: six with its longswords and one with its tail. Traits: Magic Resistance, Magic Weapons, Reactive"},
+		"planetar": {ID: "planetar", Name: "Planetar", CR: 16, HP: 200, AC: 19, Attack: 26, AttackBonus: 12, Speed: 16, BlockRate: 0.15, XPValue: 15000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The planetar makes two melee attacks. Traits: Angelic Weapons, Divine Awareness, Innate Spellcasting, Magic Resistance"},
+		"adult_gold_dragon": {ID: "adult_gold_dragon", Name: "Adult Gold Dragon", CR: 17, HP: 256, AC: 19, Attack: 28, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 18000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)", FireAttacker: true},
+		"adult_red_dragon": {ID: "adult_red_dragon", Name: "Adult Red Dragon", CR: 17, HP: 256, AC: 19, Attack: 28, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 18000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)", FireAttacker: true},
+		"androsphinx": {ID: "androsphinx", Name: "Androsphinx", CR: 17, HP: 199, AC: 17, Attack: 28, AttackBonus: 12, Speed: 16, BlockRate: 0.1, XPValue: 18000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The sphinx makes two claw attacks. Traits: Inscrutable, Magic Weapons, Spellcasting"},
+		"dragon_turtle": {ID: "dragon_turtle", Name: "Dragon Turtle", CR: 17, HP: 341, AC: 20, Attack: 28, AttackBonus: 0, Speed: 8, BlockRate: 0.15, XPValue: 18000, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The dragon turtle makes three attacks: one with its bite and two with its claws. Traits: Amphibious", FireAttacker: true},
+		"balor": {ID: "balor", Name: "Balor", CR: 19, HP: 262, AC: 19, Attack: 31, AttackBonus: 14, Speed: 16, BlockRate: 0.15, XPValue: 22000, Ability: &MonsterAbility{Name: "Death Burst", Phase: "decisive", ProcChance: 1, Effect: "death_aoe"}, Notes: "SRD-tuned baseline — Death Burst (death_aoe) wired from traits. Multiattack: The balor makes two attacks: one with its longsword and one with its whip. Traits: Death Throes, Fire Aura, Magic Resistance, Magic Weapons"},
+		"ancient_brass_dragon": {ID: "ancient_brass_dragon", Name: "Ancient Brass Dragon", CR: 20, HP: 297, AC: 20, Attack: 33, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 25000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)", FireAttacker: true},
+		"ancient_white_dragon": {ID: "ancient_white_dragon", Name: "Ancient White Dragon", CR: 20, HP: 333, AC: 20, Attack: 33, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 25000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Ice Walk, Legendary Resistance (3/Day)"},
+		"pit_fiend": {ID: "pit_fiend", Name: "Pit Fiend", CR: 20, HP: 300, AC: 19, Attack: 33, AttackBonus: 14, Speed: 12, BlockRate: 0.15, XPValue: 25000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The pit fiend makes four attacks: one with its bite, one with its claw, one with its mace, and one with its tail. Traits: Fear Aura, Magic Resistance, Magic Weapons, Innate Spellcasting"},
+		"ancient_black_dragon": {ID: "ancient_black_dragon", Name: "Ancient Black Dragon", CR: 21, HP: 367, AC: 22, Attack: 34, AttackBonus: 15, Speed: 16, BlockRate: 0.15, XPValue: 33000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)"},
+		"ancient_copper_dragon": {ID: "ancient_copper_dragon", Name: "Ancient Copper Dragon", CR: 21, HP: 350, AC: 21, Attack: 34, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 33000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)"},
+		"lich": {ID: "lich", Name: "Lich", CR: 21, HP: 135, AC: 17, Attack: 34, AttackBonus: 12, Speed: 12, BlockRate: 0.1, XPValue: 33000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Traits: Legendary Resistance (3/Day), Rejuvenation, Spellcasting, Turn Resistance"},
+		"solar": {ID: "solar", Name: "Solar", CR: 21, HP: 243, AC: 21, Attack: 34, AttackBonus: 15, Speed: 18, BlockRate: 0.15, XPValue: 33000, Ability: &MonsterAbility{Name: "Spellcasting", Phase: "opening", ProcChance: 0.5, Effect: "aoe"}, Notes: "SRD-tuned baseline — Spellcasting (aoe) wired from traits. Multiattack: The solar makes two greatsword attacks. Traits: Angelic Weapons, Divine Awareness, Innate Spellcasting, Magic Resistance"},
+		"ancient_bronze_dragon": {ID: "ancient_bronze_dragon", Name: "Ancient Bronze Dragon", CR: 22, HP: 444, AC: 22, Attack: 36, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 41000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)"},
+		"ancient_green_dragon": {ID: "ancient_green_dragon", Name: "Ancient Green Dragon", CR: 22, HP: 385, AC: 21, Attack: 36, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 41000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)"},
+		"ancient_blue_dragon": {ID: "ancient_blue_dragon", Name: "Ancient Blue Dragon", CR: 23, HP: 481, AC: 22, Attack: 37, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 50000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)"},
+		"ancient_silver_dragon": {ID: "ancient_silver_dragon", Name: "Ancient Silver Dragon", CR: 23, HP: 487, AC: 22, Attack: 37, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 50000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)"},
+		"kraken": {ID: "kraken", Name: "Kraken", CR: 23, HP: 472, AC: 18, Attack: 37, AttackBonus: 7, Speed: 8, BlockRate: 0.15, XPValue: 50000, Notes: "SRD-tuned baseline — no ability wired (traits are non-combat). Multiattack: The kraken makes three tentacle attacks, each of which it can replace with one use of Fling. Traits: Amphibious, Freedom of Movement, Siege Monster"},
+		"ancient_gold_dragon": {ID: "ancient_gold_dragon", Name: "Ancient Gold Dragon", CR: 24, HP: 546, AC: 22, Attack: 38, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 62000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Amphibious, Legendary Resistance (3/Day)", FireAttacker: true},
+		"ancient_red_dragon": {ID: "ancient_red_dragon", Name: "Ancient Red Dragon", CR: 24, HP: 546, AC: 22, Attack: 38, AttackBonus: 0, Speed: 16, BlockRate: 0.15, XPValue: 62000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The dragon can use its Frightful Presence. Traits: Legendary Resistance (3/Day)", FireAttacker: true},
+		"tarrasque": {ID: "tarrasque", Name: "Tarrasque", CR: 30, HP: 676, AC: 25, Attack: 46, AttackBonus: 19, Speed: 16, BlockRate: 0.15, XPValue: 155000, Ability: &MonsterAbility{Name: "Magic Resistance", Phase: "any", ProcChance: 0.5, Effect: "spell_resist"}, Notes: "SRD-tuned baseline — Magic Resistance (spell_resist) wired from traits. Multiattack: The tarrasque can use its Frightful Presence. Traits: Legendary Resistance (3/Day), Magic Resistance, Reflective Carapace, Siege Monster"},
+	}
+}

internal/plugin/bestiary_tuned_test.go

@@ -0,0 +1,131 @@
+package plugin
+
+import "testing"
+
+// TestTunedBestiarySRD_Populated guards the generated tuned table: every SRD
+// monster should derive a structurally sane DnDMonsterTemplate. Regenerate with
+// `go run ./cmd/open5e-import gen tuned` if the SRD set or formula changes.
+func TestTunedBestiarySRD_Populated(t *testing.T) {
+	if len(tunedBestiarySRD) < 300 {
+		t.Fatalf("tunedBestiarySRD has %d entries, want the full SRD set (~322)", len(tunedBestiarySRD))
+	}
+	for id, m := range tunedBestiarySRD {
+		if m.ID != id {
+			t.Errorf("%s: ID field = %q, want map key", id, m.ID)
+		}
+		if m.Name == "" {
+			t.Errorf("%s: empty Name", id)
+		}
+		if m.HP <= 0 {
+			t.Errorf("%s: HP=%d, want positive", id, m.HP)
+		}
+		if m.AC < 10 {
+			t.Errorf("%s: AC=%d, want >= 10 (engine minimum)", id, m.AC)
+		}
+		if m.Attack < 1 {
+			t.Errorf("%s: Attack=%d, want >= 1", id, m.Attack)
+		}
+		if m.Speed < 6 || m.Speed > 18 {
+			t.Errorf("%s: Speed=%d, want within [6,18]", id, m.Speed)
+		}
+		// Ability is optional (nil when the creature's traits are all
+		// non-combat), but a wired one must be structurally sane.
+		if m.Ability != nil {
+			a := m.Ability
+			if a.Name == "" {
+				t.Errorf("%s: Ability has empty Name", id)
+			}
+			if !tunedAbilityPhases[a.Phase] {
+				t.Errorf("%s: Ability.Phase=%q, want a known combat phase", id, a.Phase)
+			}
+			if a.ProcChance <= 0 || a.ProcChance > 1 {
+				t.Errorf("%s: Ability.ProcChance=%v, want within (0,1]", id, a.ProcChance)
+			}
+			if !tunedAbilityEffects[a.Effect] {
+				t.Errorf("%s: Ability.Effect=%q, want an engine-recognised effect", id, a.Effect)
+			}
+		}
+	}
+}
+
+// tunedAbilityPhases / tunedAbilityEffects are the values the trait classifier
+// (abilityFromTraits in cmd/open5e-import/tuned.go) is allowed to emit. The
+// effect set is the subset of applyAbility's vocabulary the classifier uses;
+// if a new trait rule introduces another effect, add it here too.
+var tunedAbilityPhases = map[string]bool{
+	"opening": true, "clash": true, "decisive": true, "any": true,
+}
+
+var tunedAbilityEffects = map[string]bool{
+	"death_aoe": true, "aoe": true, "survive_at_1": true, "regenerate": true,
+	"spell_resist": true, "bonus_damage": true, "stun": true, "enrage": true,
+	"retaliate": true, "advantage": true, "evade": true,
+}
+
+// TestTunedBestiarySRD_AbilityWiring spot-checks the trait→ability classifier:
+// a creature with a combat trait gets the expected effect, and one whose traits
+// are all non-combat stays nil.
+func TestTunedBestiarySRD_AbilityWiring(t *testing.T) {
+	cases := []struct {
+		id     string
+		effect string // "" means Ability should be nil
+	}{
+		{"troll", "regenerate"}, // Regeneration
+		{"goblin", "evade"},     // Nimble Escape
+		{"balor", "death_aoe"},  // Death Throes (priority over Magic Resistance)
+		{"lich", "aoe"},         // Spellcasting
+		{"awakened_shrub", ""},  // False Appearance — no rule, stays nil
+		{"badger", ""},          // Keen Smell — non-combat
+	}
+	for _, tc := range cases {
+		m, ok := tunedBestiarySRD[tc.id]
+		if !ok {
+			t.Errorf("%s missing from tuned bestiary", tc.id)
+			continue
+		}
+		switch {
+		case tc.effect == "" && m.Ability != nil:
+			t.Errorf("%s: Ability=%+v, want nil", tc.id, m.Ability)
+		case tc.effect != "" && m.Ability == nil:
+			t.Errorf("%s: Ability is nil, want effect %q", tc.id, tc.effect)
+		case tc.effect != "" && m.Ability.Effect != tc.effect:
+			t.Errorf("%s: Ability.Effect=%q, want %q", tc.id, m.Ability.Effect, tc.effect)
+		}
+	}
+}
+
+// TestTunedBestiarySRD_MergedIntoRoster confirms the init-time merge ran and
+// that hand-authored dndBestiary entries win over the generated baseline.
+func TestTunedBestiarySRD_MergedIntoRoster(t *testing.T) {
+	// A tuned-only creature (no hand-authored entry) should be in the roster.
+	if _, ok := dndBestiary["tarrasque"]; !ok {
+		t.Error("tarrasque missing from dndBestiary — tuned merge did not run")
+	}
+	// Owlbear is hand-authored; the roster entry must keep the playtested
+	// values (and its wired Ability), not the generated baseline.
+	ob, ok := dndBestiary["owlbear"]
+	if !ok {
+		t.Fatal("owlbear missing from dndBestiary")
+	}
+	if ob.Ability == nil {
+		t.Error("owlbear lost its hand-authored Ability — tuned baseline clobbered the roster entry")
+	}
+}
+
+// TestAttackByCR_KnownAnchors spot-checks the Attack curve against playtested
+// roster values so a formula regression surfaces as a mismatch.
+func TestTunedBestiarySRD_KnownEntry(t *testing.T) {
+	ab, ok := tunedBestiarySRD["aboleth"]
+	if !ok {
+		t.Fatal("aboleth missing from tuned bestiary")
+	}
+	// HP/AC verbatim SRD; Attack from the CR-10 anchor; AttackBonus from the
+	// hardest-hitting attack (Tentacle, +9).
+	if ab.HP != 135 || ab.AC != 17 || ab.Attack != 16 || ab.AttackBonus != 9 {
+		t.Errorf("aboleth = HP %d / AC %d / Attack %d / AB %d, want 135 / 17 / 16 / 9",
+			ab.HP, ab.AC, ab.Attack, ab.AttackBonus)
+	}
+	if ab.XPValue != 5900 {
+		t.Errorf("aboleth XPValue = %d, want 5900", ab.XPValue)
+	}
+}

internal/plugin/bootstrap_phase5b_hp.go

@@ -0,0 +1,95 @@
+package plugin
+
+import (
+	"log/slog"
+
+	"gogobee/internal/db"
+)
+
+// bootstrapPhase5BHPRefresh recomputes hp_max for every dnd_character
+// row after the Phase 5-B HP multiplier (phase5BHPMult in dnd.go)
+// shipped. Without this, existing characters keep their pre-Phase-5-B
+// hp_max until something else recomputes it (level-up, character reset,
+// migration), so the durability lift wouldn't reach live players for
+// weeks. See gogobee_expedition_difficulty.md Phase 5-B.
+//
+// Pattern mirrors bumpDexFloorForExistingCharacters: enumerate, derive
+// new value, update only rows where the new value differs. hp_current
+// is bumped by the same delta so a full-HP character stays at full HP
+// after the bump; a wounded character keeps the same absolute wound
+// (e.g. -7 HP) so the lift only raises the *ceiling*, not the present
+// HP — players don't get a free heal on top of a permanent buff.
+//
+// Idempotent via the db.JobCompleted gate. The job key is bumped if we
+// ever ship a second HP-curve change so the migration runs once per
+// shipped change.
+func bootstrapPhase5BHPRefresh() {
+	const jobName = "phase5b_hp_refresh_v1"
+	if db.JobCompleted(jobName, "once") {
+		return
+	}
+
+	d := db.Get()
+	rows, err := d.Query(`
+		SELECT user_id, class, con_score, dnd_level, hp_max, hp_current
+		FROM dnd_character WHERE dnd_level > 0`)
+	if err != nil {
+		slog.Error("phase5b hp refresh: enumerate failed", "err", err)
+		return
+	}
+	defer rows.Close()
+
+	type row struct {
+		userID    string
+		class     DnDClass
+		conScore  int
+		level     int
+		hpMax     int
+		hpCurrent int
+	}
+	var batch []row
+	for rows.Next() {
+		var r row
+		var classStr string
+		if err := rows.Scan(&r.userID, &classStr, &r.conScore, &r.level, &r.hpMax, &r.hpCurrent); err != nil {
+			slog.Warn("phase5b hp refresh: scan failed", "err", err)
+			continue
+		}
+		r.class = DnDClass(classStr)
+		batch = append(batch, r)
+	}
+
+	refreshed := 0
+	for _, r := range batch {
+		conMod := abilityModifier(r.conScore)
+		newMax := computeMaxHP(r.class, conMod, r.level)
+		if newMax <= r.hpMax {
+			// Either already at/above target (re-runs, or the row was
+			// hand-edited above formula), or the formula change reduced
+			// HP for this class — leave it alone in that case so we
+			// never *lower* a player's HP via bootstrap.
+			continue
+		}
+		delta := newMax - r.hpMax
+		newCurrent := r.hpCurrent + delta
+		if newCurrent > newMax {
+			newCurrent = newMax
+		}
+		if newCurrent < 1 {
+			newCurrent = 1
+		}
+		if _, err := d.Exec(`UPDATE dnd_character
+			SET hp_max = ?, hp_current = ?, updated_at = CURRENT_TIMESTAMP
+			WHERE user_id = ?`,
+			newMax, newCurrent, r.userID); err != nil {
+			slog.Warn("phase5b hp refresh: update failed", "user", r.userID, "err", err)
+			continue
+		}
+		refreshed++
+	}
+
+	db.MarkJobCompleted(jobName, "once")
+	if refreshed > 0 {
+		slog.Info("phase5b hp refresh: refreshed character HPMax to Phase 5-B floor", "count", refreshed)
+	}
+}

internal/plugin/bootstrap_player_meta.go

@@ -0,0 +1,201 @@
+package plugin
+
+import (
+	"database/sql"
+	"log/slog"
+
+	"gogobee/internal/db"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// bootstrapPlayerMetaFromLegacy migrates rows from adventure_characters into
+// player_meta for any user_id not already present, using the canonical
+// upsertAllPlayerMetaFromAdvChar fan-out. Idempotent — re-runs touch zero
+// rows once every legacy character has been migrated.
+//
+// Required when deploying L5 close-out code onto a database that hasn't gone
+// through the L4-L5h dual-write soak (fresh restores from old backups, dev
+// environments cloned from older snapshots, or — most importantly — a prod
+// upgrade that skipped the soak window). Without this, the rewired
+// loadAdvCharacter (which sources from player_meta) returns zero characters
+// and silently strands every account.
+//
+// No-ops post-purge — the sqlite_master existence check short-circuits once
+// adventure_characters is dropped.
+func bootstrapPlayerMetaFromLegacy() {
+	d := db.Get()
+
+	var legacyExists int
+	if err := d.QueryRow(
+		`SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='adventure_characters'`,
+	).Scan(&legacyExists); err != nil || legacyExists == 0 {
+		return
+	}
+
+	rows, err := d.Query(`
+		SELECT user_id FROM adventure_characters
+		WHERE user_id NOT IN (SELECT user_id FROM player_meta)`)
+	if err != nil {
+		slog.Error("bootstrap: legacy enumeration failed", "err", err)
+		return
+	}
+	var todo []id.UserID
+	for rows.Next() {
+		var uid string
+		if err := rows.Scan(&uid); err != nil {
+			rows.Close()
+			slog.Error("bootstrap: scan failed", "err", err)
+			return
+		}
+		todo = append(todo, id.UserID(uid))
+	}
+	rows.Close()
+
+	if len(todo) == 0 {
+		return
+	}
+
+	migrated := 0
+	for _, uid := range todo {
+		char, err := loadAdvCharacterFromLegacyTable(uid)
+		if err != nil {
+			slog.Error("bootstrap: failed to load legacy AdvCharacter", "user", uid, "err", err)
+			continue
+		}
+		// Seed the player_meta row first so the fan-out's per-subsystem
+		// upserts have something to ON CONFLICT update.
+		if _, err := d.Exec(
+			`INSERT INTO player_meta (user_id, display_name, created_at, last_active_at, alive)
+			 VALUES (?, ?, ?, ?, ?)
+			 ON CONFLICT(user_id) DO NOTHING`,
+			string(uid), char.DisplayName, char.CreatedAt, char.LastActiveAt,
+			boolToInt(char.Alive),
+		); err != nil {
+			slog.Error("bootstrap: failed to seed player_meta", "user", uid, "err", err)
+			continue
+		}
+		if err := upsertAllPlayerMetaFromAdvChar(char); err != nil {
+			slog.Error("bootstrap: fan-out failed", "user", uid, "err", err)
+			continue
+		}
+		migrated++
+	}
+	slog.Warn("bootstrap: legacy AdvCharacter rows migrated to player_meta",
+		"migrated", migrated, "total", len(todo))
+}
+
+// loadAdvCharacterFromLegacyTable runs the pre-L5h 70-column SELECT against
+// adventure_characters. Used only by the bootstrap path; the live loader
+// goes through player_meta + applyPlayerMetaOverlay.
+func loadAdvCharacterFromLegacyTable(userID id.UserID) (*AdventureCharacter, error) {
+	d := db.Get()
+	c := &AdventureCharacter{}
+	var alive, actionTaken, holidayTaken, rivalUnlocked, babysitAct int
+	var deadUntil, reprieveLast, babysitExp, pardonUsed sql.NullTime
+	var mistyLastSeen, arinaLastSeen, mistyBuffExp, mistyDebuffExp, arinaBuffExp sql.NullTime
+	var houseFrozen, houseAutopay int
+	var petChasedAway, petReactivated, petArrived, thomAnimalLine, petSupplyUnlocked, petMorningDef int
+	var autoBabysit, streakDecayed, treasuresLocked int
+
+	err := d.QueryRow(`
+		SELECT user_id, display_name,
+		       combat_level, mining_skill, foraging_skill, fishing_skill,
+		       combat_xp, mining_xp, foraging_xp, fishing_xp,
+		       alive, dead_until, action_taken_today, holiday_action_taken,
+		       arena_wins, arena_losses, invasion_score, title,
+		       current_streak, best_streak, last_action_date, grudge_location,
+		       created_at, last_active_at, death_reprieve_last,
+		       masterwork_drops_received,
+		       rival_pool, rival_unlocked_notified,
+		       babysit_active, babysit_expires_at, babysit_skill_focus,
+		       hospital_visits, robbie_visit_count, last_death_date,
+		       combat_actions_used, harvest_actions_used,
+		       last_pardon_used,
+		       misty_last_seen, arina_last_seen,
+		       misty_buff_expires, misty_debuff_expires, arina_buff_expires,
+		       npc_msg_count, npc_msg_count_date,
+		       misty_roll_target, arina_roll_target,
+		       house_tier, house_loan_balance, house_loan_frozen, house_missed_payments,
+		       house_autopay, house_current_rate,
+		       pet_type, pet_name, pet_xp, pet_level, pet_armor_tier,
+		       pet_chased_away, pet_reactivated, pet_arrived,
+		       misty_encounter_count, misty_donated_count,
+		       thom_animal_line_fired, pet_supply_shop_unlocked, pet_level10_date,
+		       pet_morning_defense, auto_babysit, streak_decayed, crafts_succeeded,
+		       death_source, death_location, auto_babysit_focus, treasures_locked
+		FROM adventure_characters WHERE user_id = ?`, string(userID)).Scan(
+		&c.UserID, &c.DisplayName,
+		&c.CombatLevel, &c.MiningSkill, &c.ForagingSkill, &c.FishingSkill,
+		&c.CombatXP, &c.MiningXP, &c.ForagingXP, &c.FishingXP,
+		&alive, &deadUntil, &actionTaken, &holidayTaken,
+		&c.ArenaWins, &c.ArenaLosses, &c.InvasionScore, &c.Title,
+		&c.CurrentStreak, &c.BestStreak, &c.LastActionDate, &c.GrudgeLocation,
+		&c.CreatedAt, &c.LastActiveAt, &reprieveLast,
+		&c.MasterworkDropsReceived,
+		&c.RivalPool, &rivalUnlocked,
+		&babysitAct, &babysitExp, &c.BabysitSkillFocus,
+		&c.HospitalVisits, &c.RobbieVisitCount, &c.LastDeathDate,
+		&c.CombatActionsUsed, &c.HarvestActionsUsed,
+		&pardonUsed,
+		&mistyLastSeen, &arinaLastSeen,
+		&mistyBuffExp, &mistyDebuffExp, &arinaBuffExp,
+		&c.NPCMsgCount, &c.NPCMsgCountDate,
+		&c.MistyRollTarget, &c.ArinaRollTarget,
+		&c.HouseTier, &c.HouseLoanBalance, &houseFrozen, &c.HouseMissedPayments,
+		&houseAutopay, &c.HouseCurrentRate,
+		&c.PetType, &c.PetName, &c.PetXP, &c.PetLevel, &c.PetArmorTier,
+		&petChasedAway, &petReactivated, &petArrived,
+		&c.MistyEncounterCount, &c.MistyDonatedCount,
+		&thomAnimalLine, &petSupplyUnlocked, &c.PetLevel10Date,
+		&petMorningDef, &autoBabysit, &streakDecayed, &c.CraftsSucceeded,
+		&c.DeathSource, &c.DeathLocation, &c.AutoBabysitFocus, &treasuresLocked,
+	)
+	if err != nil {
+		return nil, err
+	}
+	c.Alive = alive == 1
+	c.ActionTakenToday = actionTaken == 1
+	c.HolidayActionTaken = holidayTaken == 1
+	c.RivalUnlockedNotified = rivalUnlocked == 1
+	c.BabysitActive = babysitAct == 1
+	c.HouseLoanFrozen = houseFrozen == 1
+	c.HouseAutopay = houseAutopay == 1
+	c.PetChasedAway = petChasedAway == 1
+	c.PetReactivated = petReactivated == 1
+	c.PetArrived = petArrived == 1
+	c.ThomAnimalLineFired = thomAnimalLine == 1
+	c.PetSupplyShopUnlocked = petSupplyUnlocked == 1
+	c.PetMorningDefense = petMorningDef == 1
+	c.AutoBabysit = autoBabysit == 1
+	c.StreakDecayed = streakDecayed == 1
+	c.TreasuresLocked = treasuresLocked == 1
+	if deadUntil.Valid {
+		c.DeadUntil = &deadUntil.Time
+	}
+	if reprieveLast.Valid {
+		c.DeathReprieveLast = &reprieveLast.Time
+	}
+	if babysitExp.Valid {
+		c.BabysitExpiresAt = &babysitExp.Time
+	}
+	if pardonUsed.Valid {
+		c.LastPardonUsed = &pardonUsed.Time
+	}
+	if mistyLastSeen.Valid {
+		c.MistyLastSeen = &mistyLastSeen.Time
+	}
+	if arinaLastSeen.Valid {
+		c.ArinaLastSeen = &arinaLastSeen.Time
+	}
+	if mistyBuffExp.Valid {
+		c.MistyBuffExpires = &mistyBuffExp.Time
+	}
+	if mistyDebuffExp.Valid {
+		c.MistyDebuffExpires = &mistyDebuffExp.Time
+	}
+	if arinaBuffExp.Valid {
+		c.ArinaBuffExpires = &arinaBuffExp.Time
+	}
+	return c, nil
+}

internal/plugin/bootstrap_streak_restore.go

@@ -0,0 +1,69 @@
+package plugin
+
+import (
+	"log/slog"
+
+	"gogobee/internal/db"
+)
+
+// bootstrapRestoreExpeditionStreakDecay reverses the one-time streak halving
+// applied by midnightReset to players who were on an active expedition. The
+// idle reaper used to ignore expedition activity (it only inspected the
+// legacy CombatActionsUsed/HarvestActionsUsed counters), so expeditioners
+// were shamed and had their streak divided by 2.
+//
+// Restoration: CurrentStreak doubles (recovering the integer-divide), capped
+// at BestStreak. The odd-half is recovered by adding 1 when BestStreak
+// allows — pre-decay value was either CurrentStreak*2 or CurrentStreak*2+1,
+// and BestStreak is a monotonic ceiling that bounds the original.
+//
+// Idempotent: gated on a fixed job key so it runs at most once per DB.
+func bootstrapRestoreExpeditionStreakDecay() {
+	const jobName = "idle_reaper_expedition_streak_restore_v1"
+	if db.JobCompleted(jobName, "once") {
+		return
+	}
+
+	chars, err := loadAllAdvCharacters()
+	if err != nil {
+		slog.Error("bootstrap: streak restore — failed to load characters", "err", err)
+		return
+	}
+
+	restored := 0
+	for _, char := range chars {
+		if !char.StreakDecayed || char.CurrentStreak == 0 {
+			continue
+		}
+		exp, err := getActiveExpedition(char.UserID)
+		if err != nil {
+			slog.Warn("bootstrap: streak restore — expedition lookup failed", "user", char.UserID, "err", err)
+			continue
+		}
+		if exp == nil {
+			continue
+		}
+
+		old := char.CurrentStreak
+		candidate := old*2 + 1
+		if char.BestStreak > 0 && candidate > char.BestStreak {
+			candidate = char.BestStreak
+		}
+		if candidate < old*2 {
+			candidate = old * 2
+		}
+		char.CurrentStreak = candidate
+		char.StreakDecayed = false
+		if err := saveAdvCharacter(&char); err != nil {
+			slog.Error("bootstrap: streak restore — save failed", "user", char.UserID, "err", err)
+			continue
+		}
+		slog.Info("bootstrap: streak restored", "user", char.UserID, "old", old, "new", candidate, "best", char.BestStreak)
+		restored++
+	}
+
+	db.MarkJobCompleted(jobName, "once")
+	if restored > 0 {
+		slog.Warn("bootstrap: expedition streak decay restored", "count", restored)
+	}
+}

internal/plugin/cleanup_g9.go

@@ -0,0 +1,37 @@
+package plugin
+
+import (
+	"log/slog"
+	"os"
+	"strings"
+
+	"gogobee/internal/db"
+)
+
+// purgeLegacyZoneRunColumns drops the dnd_zone_run.current_room and
+// dnd_zone_run.room_seq_json columns when the operator opts in via
+// GOGOBEE_BRANCHING_PURGE=1. Phase G9 close-out: G9a removed the
+// runtime gate, G9b stopped persisting the columns, and this is the
+// final step.
+//
+// Idempotent: skips silently when the columns are already gone (or
+// never existed on a fresh install — the schema in db.go no longer
+// creates them).
+func purgeLegacyZoneRunColumns() {
+	if os.Getenv("GOGOBEE_BRANCHING_PURGE") != "1" {
+		return
+	}
+	d := db.Get()
+	for _, col := range []string{"current_room", "room_seq_json"} {
+		if _, err := d.Exec("ALTER TABLE dnd_zone_run DROP COLUMN " + col); err != nil {
+			msg := err.Error()
+			// "no such column" → already dropped (or fresh install).
+			if strings.Contains(msg, "no such column") {
+				continue
+			}
+			slog.Error("G9 purge: drop column failed", "col", col, "err", err)
+			return
+		}
+		slog.Warn("G9 purge: dnd_zone_run column dropped (GOGOBEE_BRANCHING_PURGE=1)", "col", col)
+	}
+}

internal/plugin/cleanup_l3.go

@@ -0,0 +1,111 @@
+package plugin
+
+import (
+	"log/slog"
+
+	"gogobee/internal/db"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// closeAndRefundLegacyCoopRuns is the Phase L3 one-shot. On every startup
+// it scans for any coop_dungeon_runs still in 'open' or 'active' status,
+// refunds member contributions and unsettled bets via the wallet, and
+// flips the run to 'cancelled'.
+//
+// Idempotent: once a run is 'cancelled' it is skipped on subsequent runs.
+// The cancel UPDATE is per-run with a status-guard, so two parallel calls
+// (or a crashed-then-restarted process) will not double-credit a member
+// or bettor — only the writer that flips status from 'open'/'active' to
+// 'cancelled' performs the refund for that run.
+//
+// Tables are NOT dropped here. Historical rows remain for querying; a
+// future GOGOBEE_COOP_PURGE pass will drop the schema.
+func closeAndRefundLegacyCoopRuns(euro *EuroPlugin) {
+	d := db.Get()
+
+	rows, err := d.Query(`SELECT id FROM coop_dungeon_runs WHERE status IN ('open','active')`)
+	if err != nil {
+		slog.Error("coop L3 cleanup: list runs", "err", err)
+		return
+	}
+	var runIDs []int
+	for rows.Next() {
+		var id int
+		if err := rows.Scan(&id); err != nil {
+			slog.Error("coop L3 cleanup: scan run id", "err", err)
+			continue
+		}
+		runIDs = append(runIDs, id)
+	}
+	rows.Close()
+
+	if len(runIDs) == 0 {
+		return
+	}
+
+	totalRuns, totalMembers, totalBets := 0, 0, 0
+	for _, runID := range runIDs {
+		res, err := d.Exec(`UPDATE coop_dungeon_runs
+			SET status = 'cancelled', completed_at = CURRENT_TIMESTAMP
+			WHERE id = ? AND status IN ('open','active')`, runID)
+		if err != nil {
+			slog.Error("coop L3 cleanup: cancel run", "run_id", runID, "err", err)
+			continue
+		}
+		n, _ := res.RowsAffected()
+		if n != 1 {
+			continue
+		}
+		totalRuns++
+
+		mRows, err := d.Query(`SELECT user_id, total_contributed
+			FROM coop_dungeon_members
+			WHERE run_id = ? AND total_contributed > 0`, runID)
+		if err != nil {
+			slog.Error("coop L3 cleanup: load members", "run_id", runID, "err", err)
+		} else {
+			for mRows.Next() {
+				var uid string
+				var amt int
+				if err := mRows.Scan(&uid, &amt); err != nil {
+					slog.Error("coop L3 cleanup: scan member", "run_id", runID, "err", err)
+					continue
+				}
+				if euro != nil && amt > 0 {
+					euro.Credit(id.UserID(uid), float64(amt), "coop_l3_cancel_refund")
+					totalMembers++
+				}
+			}
+			mRows.Close()
+		}
+
+		bRows, err := d.Query(`SELECT player_id, amount
+			FROM coop_dungeon_bets
+			WHERE run_id = ? AND payout IS NULL`, runID)
+		if err != nil {
+			slog.Error("coop L3 cleanup: load bets", "run_id", runID, "err", err)
+		} else {
+			for bRows.Next() {
+				var uid string
+				var amt int
+				if err := bRows.Scan(&uid, &amt); err != nil {
+					slog.Error("coop L3 cleanup: scan bet", "run_id", runID, "err", err)
+					continue
+				}
+				if euro != nil && amt > 0 {
+					euro.Credit(id.UserID(uid), float64(amt), "coop_l3_cancel_bet_refund")
+					totalBets++
+				}
+			}
+			bRows.Close()
+		}
+	}
+
+	if totalRuns > 0 {
+		slog.Info("coop L3 cleanup: cancelled in-flight runs",
+			"runs_cancelled", totalRuns,
+			"member_refunds", totalMembers,
+			"bet_refunds", totalBets)
+	}
+}

internal/plugin/cleanup_l5.go

@@ -0,0 +1,40 @@
+package plugin
+
+import (
+	"log/slog"
+	"os"
+
+	"gogobee/internal/db"
+)
+
+// purgeLegacyAdvCharacterTable drops the `adventure_characters` table when
+// the operator opts in via GOGOBEE_LEGACY_PURGE=1. Phase L5 close-out: the
+// table has been frozen since L5h (saveAdvCharacter fans out into player_meta
+// only), and the loader rewire moved every read off it. This is the final
+// step.
+//
+// The pre-D&D rollback snapshot table (`adventure_characters_pre_dnd`) is
+// preserved — it's a separate insurance copy and a future
+// `GOGOBEE_PRE_DND_PURGE=1` pass can drop it once the soak window expires.
+//
+// Idempotent: skips silently if the table is already gone (or never existed
+// on a fresh install).
+func purgeLegacyAdvCharacterTable() {
+	if os.Getenv("GOGOBEE_LEGACY_PURGE") != "1" {
+		return
+	}
+	d := db.Get()
+	var name string
+	err := d.QueryRow(
+		`SELECT name FROM sqlite_master WHERE type='table' AND name='adventure_characters'`,
+	).Scan(&name)
+	if err != nil {
+		// sql.ErrNoRows or any scan error → nothing to drop.
+		return
+	}
+	if _, err := d.Exec(`DROP TABLE adventure_characters`); err != nil {
+		slog.Error("L5 purge: drop adventure_characters failed", "err", err)
+		return
+	}
+	slog.Warn("L5 purge: adventure_characters table dropped (GOGOBEE_LEGACY_PURGE=1)")
+}

internal/plugin/combat_bridge.go

@@ -10,65 +10,6 @@ import (
 	"maunium.net/go/mautrix/id"
 )
 
-// runArenaCombat executes arena combat using the new simulation engine.
-// Returns the CombatResult and the post-combat Misty condition repair amount (if any).
-func (p *AdventurePlugin) runArenaCombat(
-	userID id.UserID,
-	char *AdventureCharacter,
-	equip map[EquipmentSlot]*AdvEquipment,
-	monster *ArenaMonster,
-	arenaRound int,
-	arenaTier int,
-) (CombatResult, int) {
-	bonuses := p.loadCombatBonuses(userID, char)
-	chatLvl := p.chatLevel(userID)
-	hasGrudge := char.GrudgeLocation != ""
-
-	playerStats, playerMods := DerivePlayerStats(char, equip, bonuses, chatLvl, char.CurrentStreak, hasGrudge)
-
-	// Load consumables from inventory and auto-select
-	consumables := p.loadConsumableInventory(userID)
-	enemyStats, _ := DeriveArenaMonsterStats(monster)
-	selected := SelectConsumables(consumables, playerStats, enemyStats, arenaRound, arenaTier)
-	ApplyConsumableMods(&playerStats, &playerMods, selected)
-
-	// Misty condition repair (post-combat, not part of engine)
-	condRepair := 0
-	now := time.Now().UTC()
-	if char.MistyBuffExpires != nil && now.Before(*char.MistyBuffExpires) {
-		if rand.Float64() < 0.20 {
-			condRepair = 5
-		}
-	}
-
-	player := Combatant{
-		Name:     char.DisplayName,
-		Stats:    playerStats,
-		Mods:     playerMods,
-		IsPlayer: true,
-	}
-	enemy := Combatant{
-		Name:    monster.Name,
-		Stats:   enemyStats,
-		Mods:    CombatModifiers{DamageReduct: 1.0},
-		Ability: monster.Ability,
-	}
-
-	result := SimulateCombat(player, enemy, defaultCombatPhases)
-	result = injectConsumableEvents(result, selected, len(consumables))
-
-	// Consume used items from inventory
-	for _, c := range selected {
-		if err := removeAdvInventoryItem(c.InventoryID); err != nil {
-			slog.Error("combat: failed to consume item", "id", c.InventoryID, "name", c.Def.Name, "err", err)
-		}
-	}
-
-	p.grantCombatAchievements(userID, result)
-
-	return result, condRepair
-}
-
 // grantCombatAchievements checks combat results for achievement-worthy moments.
 func (p *AdventurePlugin) grantCombatAchievements(userID id.UserID, result CombatResult) {
 	if p.achievements == nil {
@@ -114,18 +55,46 @@ func (p *AdventurePlugin) runDungeonCombat(
 
 	playerStats, playerMods := DerivePlayerStats(char, equip, bonuses, chatLvl, char.CurrentStreak, hasGrudge)
 
-	// Penalty zone: player is weakened (mirrors +5% death, -15% success from old system)
+	// Penalty zone Attack/Defense reduction (mirrors +5% death, -15% success
+	// from old system). The MaxHP penalty is applied below, after
+	// applyDnDPlayerLayer reseats MaxHP onto the dnd HP scale.
 	if inPenaltyZone {
 		playerStats.Attack = int(float64(playerStats.Attack) * 0.85)
 		playerStats.Defense = int(float64(playerStats.Defense) * 0.85)
-		playerStats.MaxHP = int(float64(playerStats.MaxHP) * 0.90)
 	}
 
 	// Load consumables from inventory and auto-select
 	consumables := p.loadConsumableInventory(userID)
 	enemyStats, enemyMods := DeriveDungeonMonsterStats(loc)
-	selected := SelectConsumables(consumables, playerStats, enemyStats, 0, loc.Tier)
-	ApplyConsumableMods(&playerStats, &playerMods, selected)
+
+	// All combat is D&D. Auto-migrate if needed.
+	dndChar, _, err := ensureDnDCharacterForCombat(userID, char)
+	if err != nil {
+		slog.Error("dnd: ensureDnDCharacterForCombat (dungeon) failed", "user", userID, "err", err)
+		return CombatResult{}
+	}
+	applyDnDPlayerLayer(&playerStats, dndChar)
+	applyDnDEquipmentLayer(&playerStats, dndChar, equip)
+	applyDnDHPScaling(&playerStats, dndChar)
+	if inPenaltyZone {
+		playerStats.MaxHP = int(float64(playerStats.MaxHP) * 0.90)
+		if playerStats.StartHP > 0 {
+			playerStats.StartHP = int(float64(playerStats.StartHP) * 0.90)
+		}
+	}
+	applyClassPassives(&playerStats, &playerMods, dndChar)
+	applyRacePassives(&playerStats, &playerMods, dndChar)
+	applySubclassPassives(&playerStats, &playerMods, dndChar)
+	applyMagicItemEffects(&playerStats, &playerMods, userID)
+	trySimAutoArm(dndChar)
+	if firedName, fired := applyArmedAbility(dndChar, &playerMods); fired {
+		slog.Info("dnd: armed ability fired", "user", userID, "ability", firedName)
+	}
+	applyDnDDungeonMonsterLayer(&enemyStats, loc.Tier)
+	applyPendingCast(userID, dndChar, &playerStats, &playerMods, &enemyStats)
+
+	// Auto-consumable: panic heal only (see dnd_boss_consumables.go).
+	setupAutoHealFromInventory(consumables, &playerMods)
 
 	// Dungeon monsters T3+ can have abilities
 	var ability *MonsterAbility
@@ -138,8 +107,9 @@ func (p *AdventurePlugin) runDungeonCombat(
 		ability = &MonsterAbility{Name: "Stone Skin", Phase: "opening", ProcChance: 0.20, Effect: "armor_break"}
 	}
 
+	displayName, _ := loadDisplayName(userID)
 	player := Combatant{
-		Name:     char.DisplayName,
+		Name:     displayName,
 		Stats:    playerStats,
 		Mods:     playerMods,
 		IsPlayer: true,
@@ -152,17 +122,27 @@ func (p *AdventurePlugin) runDungeonCombat(
 	}
 
 	result := SimulateCombat(player, enemy, dungeonCombatPhases)
-	result = injectConsumableEvents(result, selected, len(consumables))
+	dumpCombatEventsIfDebug(fmt.Sprintf("dungeon:%s vs %s", loc.Name, displayName), result)
 
-	// Consume used items from inventory
-	for _, c := range selected {
-		if err := removeAdvInventoryItem(c.InventoryID); err != nil {
-			slog.Error("combat: failed to consume item", "id", c.InventoryID, "name", c.Def.Name, "err", err)
-		}
-	}
+	// Remove the actual heal items consumed during combat. No more
+	// burning Coal Bombs / Ink Vials on chump fights — those stay put
+	// until a player-driven use command lands.
+	consumeFiredHealingItems(userID, countHealEventsFired(result))
 
 	p.grantCombatAchievements(userID, result)
 
+	persistDnDHPAfterCombat(userID, result.PlayerEndHP)
+	if err := persistDnDPostCombatSubclass(dndChar, playerMods.BerserkerRage, result, playerMods); err != nil {
+		slog.Error("dnd: post-combat subclass persist (dungeon)", "user", userID, "err", err)
+	}
+
+	if xp := dungeonCombatXP(result, loc.Tier); xp > 0 {
+		if _, err := p.grantDnDXP(userID, xp); err != nil {
+			slog.Error("dnd: grantDnDXP dungeon", "user", userID, "err", err)
+		}
+	}
+	_ = dndChar
+
 	return result
 }
 
@@ -260,12 +240,34 @@ func (p *AdventurePlugin) prependCraftNarrative(userID id.UserID, messages []str
 // Runs in a goroutine so it doesn't block the message handler.
 // Returns a channel that is closed when all messages have been sent.
 func (p *AdventurePlugin) sendCombatMessages(userID id.UserID, phaseMessages []string, finalMessage string) <-chan struct{} {
+	return p.sendCombatMessagesWithDelay(userID, phaseMessages, finalMessage, 5, 4) // 5–8s
+}
+
+// sendZoneCombatMessages is the zone/expedition variant — same staging as
+// arena, but tighter pacing (2–3s) so dungeon advances feel snappier.
+//
+// Contract: returns a done channel that closes after the final DM has
+// been sent. Callers that need to chain post-flush work (death follow-ups,
+// hospital ads, tier countdowns) MUST consume it. Callers in the middle
+// of a command-handler flow that have no post-flush work should explicitly
+// discard with `_ = ...` — blocking on flush would stall the handler
+// behind the 2–3s/message pacing, which is the whole point of streaming.
+func (p *AdventurePlugin) sendZoneCombatMessages(userID id.UserID, phaseMessages []string, finalMessage string) <-chan struct{} {
+	return p.sendCombatMessagesWithDelay(userID, phaseMessages, finalMessage, 2, 2) // 2–3s
+}
+
+// sendCombatMessagesWithDelay is the shared streamer. base/jitter define
+// the per-message delay window in seconds: delay = base + rand.IntN(jitter).
+func (p *AdventurePlugin) sendCombatMessagesWithDelay(userID id.UserID, phaseMessages []string, finalMessage string, base, jitter int) <-chan struct{} {
 	done := make(chan struct{})
 	go func() {
 		defer close(done)
 		for _, msg := range phaseMessages {
 			_ = p.SendDM(userID, msg)
-			delay := 5 + rand.IntN(4) // 5-8 seconds
+			delay := base
+			if jitter > 0 {
+				delay += rand.IntN(jitter)
+			}
 			time.Sleep(time.Duration(delay) * time.Second)
 		}
 		_ = p.SendDM(userID, finalMessage)
@@ -321,8 +323,11 @@ func applyXPBonuses(p XPBonusParams) XPResult {
 type DeathTransitionParams struct {
 	Char           *AdventureCharacter
 	Equip          map[EquipmentSlot]*AdvEquipment
+	Pet            PetState // pet state for ditch-recovery roll; zero value disables
 	ChatLevel      int
 	Location       string // set as GrudgeLocation; empty = don't set
+	Source         string // death source: "adventure" | "arena" — recorded on Kill()
+	DeathLocation  string // human-readable death location for the daily report; falls back to Location
 	AllowPardon    bool   // chat level pardon (adventure only)
 	AllowSovereign bool   // probability-band Sovereign reprieve (non-engine path)
 	EngineSaved    bool   // combat engine used Sovereign death save
@@ -371,14 +376,18 @@ func transitionDeath(p DeathTransitionParams) DeathTransitionResult {
 		return r
 	}
 
-	p.Char.Kill()
+	deathLoc := p.DeathLocation
+	if deathLoc == "" {
+		deathLoc = p.Location
+	}
+	p.Char.Kill(p.Source, deathLoc)
 	if p.Location != "" {
 		p.Char.GrudgeLocation = p.Location
 	}
 	r.Died = true
 
-	if petRollDitchRecovery(p.Char) && p.Char.DeadUntil != nil {
-		reduced := time.Now().UTC().Add(petDitchRecoveryTime(p.Char.PetLevel))
+	if petRollDitchRecovery(p.Pet) && p.Char.DeadUntil != nil {
+		reduced := time.Now().UTC().Add(petDitchRecoveryTime(p.Pet.Level))
 		p.Char.DeadUntil = &reduced
 		r.PetRecovered = true
 	}
@@ -398,12 +407,25 @@ func checkDeathSaveEvent(events []CombatEvent) bool {
 
 // injectConsumableEvents prepends use_consumable events so the narrative shows which items were consumed.
 // If items were available but skipped (trivial threat), a skip event is injected instead.
+//
+// Uses PlayerEntryHP / EnemyEntryHP — the actual HP each side entered combat
+// with — so the pre-combat HP line reflects wounded carry-over honestly. Was
+// using PlayerStartHP (= MaxHP), which made wounded entries display "47/47"
+// and made any HP loss in opening look like the player took silent damage.
 func injectConsumableEvents(result CombatResult, selected []ConsumableItem, inventorySize int) CombatResult {
+	entryHP := result.PlayerEntryHP
+	if entryHP == 0 {
+		entryHP = result.PlayerStartHP
+	}
+	enemyEntryHP := result.EnemyEntryHP
+	if enemyEntryHP == 0 {
+		enemyEntryHP = result.EnemyStartHP
+	}
 	if len(selected) == 0 {
 		if inventorySize > 0 {
 			result.Events = append([]CombatEvent{{
 				Round: 0, Phase: "pre_combat", Actor: "consumable", Action: "consumable_skip",
-				PlayerHP: result.PlayerStartHP, EnemyHP: result.EnemyStartHP,
+				PlayerHP: entryHP, EnemyHP: enemyEntryHP,
 			}}, result.Events...)
 		}
 		return result
@@ -412,7 +434,7 @@ func injectConsumableEvents(result CombatResult, selected []ConsumableItem, inve
 	for _, c := range selected {
 		events = append(events, CombatEvent{
 			Round: 0, Phase: "pre_combat", Actor: "consumable", Action: "use_consumable",
-			PlayerHP: result.PlayerStartHP, EnemyHP: result.EnemyStartHP,
+			PlayerHP: entryHP, EnemyHP: enemyEntryHP,
 			Desc: c.Def.Name,
 		})
 	}
@@ -456,6 +478,8 @@ func combatDegradation(result CombatResult, equip map[EquipmentSlot]*AdvEquipmen
 			damage[SlotHelmet] += 1 + rand.IntN(2)
 		case ev.Actor == "enemy" && ev.Action == "cleave":
 			damage[SlotArmor] += 2 + rand.IntN(3)
+		case ev.Actor == "enemy" && (ev.Action == "bonus_damage" || ev.Action == "aoe" || ev.Action == "execute" || ev.Action == "retaliate" || ev.Action == "max_hp_drain"):
+			damage[SlotArmor] += 1 + rand.IntN(2)
 		case ev.Actor == "enemy" && ev.Action == "lifesteal":
 			damage[SlotArmor] += 1 + rand.IntN(2)
 		case ev.Actor == "player" && (ev.Action == "hit" || ev.Action == "crit"):
@@ -569,15 +593,3 @@ func (p *AdventurePlugin) resolveDungeonAction(
 	return result
 }
 
-// renderArenaCombatFinalMessage builds the post-combat text (rewards, tier progress, etc.)
-// This is sent as the last message after the phase-by-phase combat messages.
-func renderArenaCombatFinalMessage(result CombatResult, monster *ArenaMonster, reward int64, battleXP int, round int) string {
-	if result.PlayerWon {
-		closer := arenaWinCloser(monster.Name, round)
-		return fmt.Sprintf("💀 **%s** has been defeated.\n%s\n🏆 +%d XP | €%d earned",
-			monster.Name, closer, battleXP, reward)
-	}
-	closer := arenaLoseCloser(monster.Name, round)
-	return fmt.Sprintf("The healers are already moving.\n💀 **Defeated.**\n%s\n+%d XP (participation) | Back tomorrow.",
-		closer, arenaParticipationXP)
-}

internal/plugin/combat_bridge_test.go

@@ -170,10 +170,9 @@ func TestTransitionDeath_SovereignReprieve(t *testing.T) {
 func TestTransitionDeath_KillAndPetRecovery(t *testing.T) {
 	deaths, petRecoveries := 0, 0
 	for i := 0; i < 500; i++ {
-		char := &AdventureCharacter{
-			Alive: true, PetType: "cat", PetArrived: true, PetLevel: 5,
-		}
-		r := transitionDeath(DeathTransitionParams{Char: char, Location: "Mine"})
+		char := &AdventureCharacter{Alive: true}
+		pet := PetState{Type: "cat", Arrived: true, Level: 5}
+		r := transitionDeath(DeathTransitionParams{Char: char, Pet: pet, Location: "Mine"})
 		if !r.Died {
 			t.Fatal("should die with no saves available")
 		}

internal/plugin/combat_cmd.go

@@ -0,0 +1,627 @@
+package plugin
+
+import (
+	"fmt"
+	"log/slog"
+	"strconv"
+	"strings"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// Phase 13 — turn-based combat command surface.
+//
+// !fight  — engage the Elite/Boss room the player is standing at, opening a
+//           persisted CombatSession.
+// !attack — resolve one full round (player turn → enemy turn → round end).
+// !flee   — break off; the run ends with a light penalty.
+//
+// !zone advance stops at an Elite/Boss doorway (see zoneCmdAdvance); the
+// player explicitly opts into the fight here. While a session is active,
+// !zone advance / enter / go are blocked — one fight locks the run.
+
+// encounterIDForRoom is the stable per-room key tying a CombatSession to the
+// room it was opened in, so a won session can be recognised by the room
+// resolver. Unique within a run; combined with run_id it's globally unique.
+func encounterIDForRoom(roomIdx int) string {
+	return fmt.Sprintf("room%d", roomIdx)
+}
+
+// ── !fight ──────────────────────────────────────────────────────────────────
+
+func (p *AdventurePlugin) handleFightCmd(ctx MessageContext) error {
+	userMu := p.advUserLock(ctx.Sender)
+	userMu.Lock()
+	defer userMu.Unlock()
+
+	run, err := getActiveZoneRun(ctx.Sender)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't read run state: "+err.Error())
+	}
+	if run == nil {
+		return p.SendDM(ctx.Sender, "No active zone run. Use `!zone enter <id>` first.")
+	}
+	roomType := run.CurrentRoomType()
+	if roomType != RoomElite && roomType != RoomBoss {
+		return p.SendDM(ctx.Sender, "Nothing to fight here — `!fight` is for Elite and Boss rooms. Use `!zone advance`.")
+	}
+
+	encID := encounterIDForRoom(run.CurrentRoom)
+	if existing, _ := getCombatSessionForEncounter(run.RunID, encID); existing != nil {
+		switch existing.Status {
+		case CombatStatusActive:
+			return p.SendDM(ctx.Sender, "You're already in this fight — `!attack` or `!flee`.")
+		case CombatStatusWon:
+			return p.SendDM(ctx.Sender, "You've already cleared this room. "+continueHint(ctx.Sender))
+		default:
+			return p.SendDM(ctx.Sender, "This fight is already over. `!zone status` for where you stand.")
+		}
+	}
+
+	zone := zoneOrFallback(run.ZoneID)
+	isBoss := roomType == RoomBoss
+	var monster DnDMonsterTemplate
+	var ok bool
+	if isBoss {
+		monster, ok = dndBestiary[zone.Boss.BestiaryID]
+	} else {
+		monster, ok = pickZoneEnemy(zone, run.RunID, run.CurrentRoom, true)
+	}
+	if !ok {
+		return p.SendDM(ctx.Sender, "_(No bestiary entry for this encounter — file a bug. `!zone abandon` to bail.)_")
+	}
+
+	player, enemy, _, err := p.buildZoneCombatants(ctx.Sender, monster, int(zone.Tier), run.DMMood)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't set up the fight: "+err.Error())
+	}
+
+	playerHP, playerMax := dndHPSnapshot(ctx.Sender)
+	if playerHP <= 0 {
+		return p.SendDM(ctx.Sender, "You're in no shape to fight. `!rest` first.")
+	}
+	enemyHP := enemy.Stats.MaxHP
+
+	sess, err := startCombatSession(ctx.Sender, run.RunID, encID, monster.ID, playerHP, playerMax, enemyHP, enemyHP)
+	if err != nil {
+		if err == ErrCombatSessionAlreadyActive {
+			return p.SendDM(ctx.Sender, "You're already in a fight. Finish it with `!attack` / `!flee`.")
+		}
+		return p.SendDM(ctx.Sender, "Couldn't start the fight: "+err.Error())
+	}
+
+	// Carry fight-start one-shot resources (Abjuration Arcane Ward, etc.) onto
+	// the session so they survive the turn engine's resume/commit cycle. The
+	// pet now rolls per-turn inside the engine, so there's no fight-start roll.
+	if seedCombatSessionOneShots(sess, player.Mods) {
+		if err := saveCombatSession(sess); err != nil {
+			slog.Error("combat: seed session one-shots", "user", ctx.Sender, "err", err)
+		}
+	}
+
+	var b strings.Builder
+	if isBoss {
+		if line := composeBossEntry(zone.ID, run.RunID, run.CurrentRoom); line != "" {
+			b.WriteString(line + "\n\n")
+		}
+		b.WriteString(fmt.Sprintf("👑 **Boss — %s** (HP %d, AC %d)\n", monster.Name, enemyHP, enemy.Stats.AC))
+	} else {
+		if line := eliteRoomEntryLine(zone.ID, run.RunID, run.CurrentRoom); line != "" {
+			b.WriteString(line + "\n\n")
+		}
+		b.WriteString(fmt.Sprintf("⚔️ **Elite — %s** (HP %d, AC %d)\n", monster.Name, enemyHP, enemy.Stats.AC))
+	}
+	b.WriteString(fmt.Sprintf("You: **%d/%d HP**.\n", playerHP, playerMax))
+	if curios := activeMagicItemsLine(ctx.Sender); curios != "" {
+		b.WriteString(curios)
+		b.WriteString("\n")
+	}
+	b.WriteString("\n")
+	b.WriteString(combatTurnPrompt(sess))
+	return p.SendDM(ctx.Sender, b.String())
+}
+
+// ── !attack / !flee ─────────────────────────────────────────────────────────
+
+func (p *AdventurePlugin) handleAttackCmd(ctx MessageContext) error {
+	return p.handleCombatActionCmd(ctx, PlayerAction{Kind: ActionAttack})
+}
+
+func (p *AdventurePlugin) handleFleeCmd(ctx MessageContext) error {
+	return p.handleCombatActionCmd(ctx, PlayerAction{Kind: ActionFlee})
+}
+
+func (p *AdventurePlugin) handleCombatActionCmd(ctx MessageContext, action PlayerAction) error {
+	userMu := p.advUserLock(ctx.Sender)
+	userMu.Lock()
+	defer userMu.Unlock()
+
+	sess, err := getActiveCombatSession(ctx.Sender)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't read combat state: "+err.Error())
+	}
+	if sess == nil {
+		return p.SendDM(ctx.Sender, "You're not in a fight. `!fight` at an Elite or Boss room to start one.")
+	}
+
+	player, enemy, err := p.combatantsForSession(sess)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't rebuild the fight: "+err.Error())
+	}
+
+	events, err := runCombatRound(sess, &player, &enemy, action)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't resolve the round: "+err.Error())
+	}
+	return p.SendDM(ctx.Sender, p.renderRoundResult(ctx.Sender, sess, events, player.Name, enemy))
+}
+
+// renderRoundResult turns a resolved round into the player-facing block: the
+// play-by-play, then either the HP/turn-prompt footer (fight continues) or the
+// close-out block (terminal status). Shared by !attack/!flee, !cast, !consume.
+func (p *AdventurePlugin) renderRoundResult(userID id.UserID, sess *CombatSession, events []CombatEvent, playerName string, enemy Combatant) string {
+	var b strings.Builder
+	b.WriteString(RenderTurnRound(events, playerName, enemy.Name))
+	if sess.IsActive() {
+		b.WriteString("\n\n")
+		b.WriteString(fmt.Sprintf("You: **%d/%d**  ·  %s: **%d/%d**\n",
+			sess.PlayerHP, sess.PlayerHPMax, enemy.Name, sess.EnemyHP, sess.EnemyHPMax))
+		b.WriteString(combatTurnPrompt(sess))
+		return b.String()
+	}
+	b.WriteString("\n\n")
+	b.WriteString(p.finishCombatSession(userID, sess, enemy))
+	return b.String()
+}
+
+// runCombatRound resolves one full round: the player's chosen action, then the
+// enemy turn and the round-end status tick, advancing the session until it is
+// back at a player_turn or has reached a terminal status. Returns every event
+// the round produced. Each advanceCombatSession call persists the session, so
+// a crash mid-round resumes cleanly from the last phase.
+func runCombatRound(sess *CombatSession, player, enemy *Combatant, action PlayerAction) ([]CombatEvent, error) {
+	events, err := advanceCombatSession(sess, player, enemy, action)
+	if err != nil {
+		return events, err
+	}
+	for sess.IsActive() && sess.Phase != CombatPhasePlayerTurn {
+		more, merr := advanceCombatSession(sess, player, enemy, PlayerAction{})
+		if merr != nil {
+			return events, merr
+		}
+		events = append(events, more...)
+	}
+	return events, nil
+}
+
+// combatTurnPrompt is the "your move" footer shown after every non-terminal
+// round and on the opening !fight message.
+func combatTurnPrompt(sess *CombatSession) string {
+	return fmt.Sprintf("**Round %d.** Your move — `!attack`, `!cast <spell>`, `!consume <item>`, or `!flee`.", sess.Round)
+}
+
+// ── close-out ───────────────────────────────────────────────────────────────
+
+// continueHint returns the verb the player uses to keep moving after a
+// manual Elite/Boss fight, phrased for their current mode. On an
+// expedition the autopilot drives the walk, so `!zone advance` is the
+// wrong surface — point them at `!expedition run` instead. Standalone
+// zone runs still advance with `!zone advance`.
+func continueHint(userID id.UserID) string {
+	if exp, err := getActiveExpedition(userID); err == nil && exp != nil {
+		return "`!expedition run` to keep going."
+	}
+	return "`!zone advance` to move on."
+}
+
+// finishCombatSession runs the post-fight side effects once a CombatSession
+// has reached a terminal status, and returns the player-facing outcome block.
+// The graph is NOT advanced here: the terminal session row is the record that
+// the room's manual combat is done, and a fresh !zone advance clears the room.
+func (p *AdventurePlugin) finishCombatSession(userID id.UserID, sess *CombatSession, enemy Combatant) string {
+	persistDnDHPAfterCombat(userID, sess.PlayerHP)
+
+	run, _ := getZoneRun(sess.RunID)
+	var zone ZoneDefinition
+	elite := true
+	cadence := sess.Round
+	if run != nil {
+		zone = zoneOrFallback(run.ZoneID)
+		elite = run.CurrentRoomType() != RoomBoss
+		cadence = narrationCadence(run)
+	}
+	monster := dndBestiary[sess.EnemyID]
+
+	// nat20/nat1 mood deltas from the whole fight's event log.
+	scanMoodEventsFromEvents(sess.RunID, sess.TurnLog)
+
+	var b strings.Builder
+	switch sess.Status {
+	case CombatStatusWon:
+		recordZoneKillForUser(userID, sess.EnemyID)
+		applyRoomCombatThreatForUser(userID, elite)
+		// zoneCombatXP only reads PlayerWon + NearDeath off the result.
+		nearDeath := sess.PlayerHPMax > 0 && sess.PlayerHP*5 < sess.PlayerHPMax
+		tier := 1
+		if run != nil {
+			tier = int(zone.Tier)
+		}
+		if xp := zoneCombatXP(CombatResult{PlayerWon: true, NearDeath: nearDeath}, monster.CR, tier); xp > 0 {
+			if _, err := p.grantDnDXP(userID, xp); err != nil {
+				slog.Error("combat: grantDnDXP turn-based", "user", userID, "err", err)
+			}
+		}
+		bossOnExpedition := false
+		if !elite {
+			// §8.1 — zone boss defeat drops expedition threat. Silent no-op
+			// for standalone zone runs (no active expedition).
+			if exp, eerr := getActiveExpedition(userID); eerr == nil && exp != nil {
+				_ = applyBossDefeatThreat(exp.ID)
+				bossOnExpedition = true
+			}
+		}
+		if line := twinBeeLine(zone.ID, DMCombatEnd, sess.RunID, cadence); line != "" {
+			b.WriteString(line + "\n")
+		}
+		emoji := "✅"
+		if !elite {
+			emoji = "🏆"
+		}
+		b.WriteString(fmt.Sprintf("%s **%s** down. You finished at **%d/%d HP**.\n",
+			emoji, enemy.Name, sess.PlayerHP, sess.PlayerHPMax))
+		if drop := p.dropZoneLoot(userID, zone.ID, monster, !elite); drop != "" {
+			b.WriteString(drop + "\n")
+		}
+		if bossOnExpedition {
+			// The boss is the expedition's climax. Frame the close-out as
+			// the win rather than a "keep walking" nudge. One more
+			// `!expedition run` walks out the cleared room and triggers
+			// finalizeExpeditionOnZoneClear (rewards + status flip).
+			b.WriteString("🎉 **Zone cleared — the expedition is won.** `!expedition run` to march out and claim your spoils.")
+		} else {
+			b.WriteString(continueHint(userID))
+		}
+
+	case CombatStatusLost:
+		if run != nil {
+			_, _ = applyMoodEvent(sess.RunID, MoodEventPlayerDeath)
+		}
+		_ = abandonZoneRun(userID)
+		forceExtractExpeditionForRunLoss(userID, "combat death")
+		markAdventureDead(userID, "zone", zone.Display)
+		if line := twinBeeLine(zone.ID, DMPlayerDeath, sess.RunID, cadence); line != "" {
+			b.WriteString(line + "\n")
+		}
+		b.WriteString(fmt.Sprintf("💀 You fell to **%s**. Run ended.", enemy.Name))
+
+	case CombatStatusFled:
+		// Flee = run ends, light penalty: wounds persist (HP already saved),
+		// but no death timer. Chosen candidate from the migration plan's
+		// open question on flee outcome.
+		_ = abandonZoneRun(userID)
+		forceExtractExpeditionForRunLoss(userID, "combat flee")
+		b.WriteString(fmt.Sprintf("🏃 You broke off from **%s** and slipped away. Run ended — you keep your wounds, but you live.", enemy.Name))
+
+	default:
+		b.WriteString("The fight is over.")
+	}
+	return b.String()
+}
+
+// ── !cast (in-combat) ───────────────────────────────────────────────────────
+//
+// handleDnDCastCmd routes here when the player has an active CombatSession:
+// !cast resolves as the player's turn for the round instead of queuing for
+// "next combat". Out-of-combat !cast is unchanged.
+
+// parseCombatCast validates a !cast invocation for a caster mid-fight and
+// returns the spell plus the resolved slot level. errMsg is non-empty and
+// player-facing on any validation failure. It performs NO resource spend —
+// the caller debits the slot only once the round is about to resolve.
+func parseCombatCast(userID id.UserID, c *DnDCharacter, args string) (SpellDefinition, int, string) {
+	tokens := strings.Fields(args)
+	upcast := 0
+	var spellTokens []string
+	for i := 0; i < len(tokens); i++ {
+		switch tokens[i] {
+		case "--upcast":
+			if i+1 < len(tokens) {
+				if n, err := strconv.Atoi(tokens[i+1]); err == nil {
+					upcast = n
+				}
+				i++
+			}
+		case "--target":
+			if i+1 < len(tokens) {
+				i++
+			}
+		default:
+			spellTokens = append(spellTokens, tokens[i])
+		}
+	}
+	if len(spellTokens) == 0 {
+		return SpellDefinition{}, 0, "Usage: `!cast <spell> [--upcast N]` — casts as your turn this round. `!spells` lists options."
+	}
+	spell, ok := parseSpell(strings.Join(spellTokens, " "))
+	if !ok {
+		return SpellDefinition{}, 0, fmt.Sprintf("Unknown spell %q. Run `!spells` to list what you know.", strings.Join(spellTokens, " "))
+	}
+	// Class gate — Arcane Trickster Rogues use the Mage list.
+	effectiveClass := c.Class
+	if c.Class == ClassRogue && c.Subclass == SubclassArcaneTrickster {
+		effectiveClass = ClassMage
+	}
+	classOK := false
+	for _, cl := range spell.Classes {
+		if cl == effectiveClass {
+			classOK = true
+			break
+		}
+	}
+	if !classOK {
+		return SpellDefinition{}, 0, fmt.Sprintf("%s is not on the %s spell list.", spell.Name, titleClass(c.Class))
+	}
+	if c.Class == ClassRogue && c.Subclass == SubclassArcaneTrickster {
+		if mx := highestAvailableSlotForChar(c); spell.Level > mx {
+			return SpellDefinition{}, 0, fmt.Sprintf("At level %d, your Arcane Trickster magic only reaches level-%d spells.", c.Level, mx)
+		}
+	}
+	known, prepared, err := playerKnowsSpell(userID, spell.ID)
+	if err != nil {
+		return SpellDefinition{}, 0, "Couldn't check your spell list."
+	}
+	if !known {
+		return SpellDefinition{}, 0, fmt.Sprintf("You don't know %s yet.", spell.Name)
+	}
+	if !prepared {
+		return SpellDefinition{}, 0, fmt.Sprintf("%s isn't prepared today. Run `!prepare %s` first.", spell.Name, spell.ID)
+	}
+	slotLevel := spell.Level
+	if upcast > slotLevel && spell.Level > 0 {
+		slotLevel = upcast
+	}
+	if slotLevel < 0 || slotLevel > 5 {
+		return SpellDefinition{}, 0, "Slot level out of range (1–5)."
+	}
+	return spell, slotLevel, ""
+}
+
+func (p *AdventurePlugin) handleCombatCastCmd(ctx MessageContext, args string) error {
+	userMu := p.advUserLock(ctx.Sender)
+	userMu.Lock()
+	defer userMu.Unlock()
+
+	sess, err := getActiveCombatSession(ctx.Sender)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't read combat state: "+err.Error())
+	}
+	if sess == nil {
+		// Race: the fight closed between the route check and the lock.
+		return p.SendDM(ctx.Sender, "You're not in a fight anymore.")
+	}
+
+	advChar, _ := loadAdvCharacter(ctx.Sender)
+	c, err := p.ensureCharForDnDCmd(ctx.Sender, advChar)
+	if err != nil || c == nil {
+		return p.SendDM(ctx.Sender, "Couldn't load your Adv 2.0 sheet.")
+	}
+	if !isSpellcaster(c) {
+		return p.SendDM(ctx.Sender, fmt.Sprintf(
+			"%s isn't a caster class. `!attack` or `!consume <item>` instead.", titleClass(c.Class)))
+	}
+
+	spell, slotLevel, errMsg := parseCombatCast(ctx.Sender, c, strings.TrimSpace(args))
+	if errMsg != "" {
+		return p.SendDM(ctx.Sender, errMsg)
+	}
+	if spell.Effect == EffectReaction {
+		return p.SendDM(ctx.Sender, fmt.Sprintf(
+			"%s is a reaction spell — those still aren't usable. Pick a damage, healing, or control spell.", spell.Name))
+	}
+
+	player, enemy, err := p.combatantsForSession(sess)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't rebuild the fight: "+err.Error())
+	}
+
+	var eff *turnActionEffect
+	if spell.Effect == EffectBuffSelf || spell.Effect == EffectBuffAlly {
+		// Buff path — resolve the buff against a throwaway combatant, fold the
+		// marginal effect into the session's persisted state, then rebuild the
+		// pair so the buff is live for this round's enemy turn.
+		as, am := player.Stats, player.Mods
+		applySpellBuff(spell, c, &as, &am, slotLevel)
+		d := diffTurnBuff(player.Stats, as, player.Mods, am)
+		if !d.any() {
+			return p.SendDM(ctx.Sender, fmt.Sprintf(
+				"%s has no effect the turn-based engine can apply yet.", spell.Name))
+		}
+		if msg := p.chargeSpellCost(ctx.Sender, spell, slotLevel); msg != "" {
+			return p.SendDM(ctx.Sender, msg)
+		}
+		sess.Statuses.applyBuffDelta(d)
+		player, enemy, err = p.combatantsForSession(sess)
+		if err != nil {
+			if spell.Level > 0 {
+				_ = refundSpellSlot(ctx.Sender, slotLevel)
+			}
+			return p.SendDM(ctx.Sender, "Couldn't rebuild the fight: "+err.Error())
+		}
+		label := spell.Name + " — active"
+		if d.heal > 0 {
+			label = fmt.Sprintf("%s — +%d HP", spell.Name, d.heal)
+		}
+		eff = &turnActionEffect{
+			Action: "spell_cast", Label: label,
+			PlayerHeal: d.heal, EnemySkip: d.enemySkip,
+		}
+	} else {
+		out, supported := resolveTurnSpell(c, spell, slotLevel, &enemy.Stats)
+		if !supported {
+			return p.SendDM(ctx.Sender, fmt.Sprintf(
+				"%s is a utility spell — those aren't usable in turn-based fights yet. Try a damage, healing, control, or buff spell.", spell.Name))
+		}
+		if msg := p.chargeSpellCost(ctx.Sender, spell, slotLevel); msg != "" {
+			return p.SendDM(ctx.Sender, msg)
+		}
+		eff = &turnActionEffect{
+			Label:       out.Desc,
+			Action:      "spell_cast",
+			EnemyDamage: out.EnemyDamage,
+			PlayerHeal:  out.PlayerHeal,
+			EnemySkip:   out.EnemySkip,
+		}
+	}
+
+	events, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionCast, Effect: eff})
+	if err != nil {
+		if spell.Level > 0 {
+			_ = refundSpellSlot(ctx.Sender, slotLevel)
+		}
+		return p.SendDM(ctx.Sender, "Couldn't resolve the round: "+err.Error())
+	}
+	return p.SendDM(ctx.Sender, p.renderRoundResult(ctx.Sender, sess, events, player.Name, enemy))
+}
+
+// chargeSpellCost debits a spell's material component and leveled slot for a
+// turn-based cast. It returns a non-empty player-facing message on failure; on
+// success the caller owns the slot and must refundSpellSlot if the round itself
+// errors. Material components (rare in a fight) are not refunded if the slot
+// debit then fails — matching the auto-resolve cast path.
+func (p *AdventurePlugin) chargeSpellCost(userID id.UserID, spell SpellDefinition, slotLevel int) string {
+	if spell.MaterialCost > 0 {
+		if p.euro == nil || !p.euro.Debit(userID, float64(spell.MaterialCost), "dnd_spell_component") {
+			return fmt.Sprintf("%s needs a %d-coin diamond component you can't afford.", spell.Name, spell.MaterialCost)
+		}
+	}
+	if spell.Level > 0 {
+		ok, serr := consumeSpellSlot(userID, slotLevel)
+		if serr != nil {
+			return "Couldn't consume slot: " + serr.Error()
+		}
+		if !ok {
+			return fmt.Sprintf("You're out of level-%d energy. %s", slotLevel, renderSlotsBrief(userID))
+		}
+	}
+	return ""
+}
+
+// ── !consume (in-combat) ────────────────────────────────────────────────────
+//
+// !consume <item> spends one combat consumable as the player's turn. Heal and
+// flat-damage items resolve fully within the round; buff-type items (ward,
+// atk/def boost, spore, reflect, auto-crit) fold into the session's persisted
+// fight-scoped state and carry for the rest of the fight.
+
+// matchConsumable resolves a player-typed name against the player's consumable
+// inventory: case-insensitive exact match first, then a unique prefix match.
+func matchConsumable(inv []ConsumableItem, query string) (*ConsumableItem, string) {
+	q := strings.ToLower(strings.TrimSpace(query))
+	if q == "" {
+		return nil, ""
+	}
+	var prefix []*ConsumableItem
+	for i := range inv {
+		name := strings.ToLower(inv[i].Def.Name)
+		if name == q {
+			return &inv[i], ""
+		}
+		if strings.HasPrefix(name, q) {
+			prefix = append(prefix, &inv[i])
+		}
+	}
+	switch len(prefix) {
+	case 0:
+		return nil, ""
+	case 1:
+		return prefix[0], ""
+	default:
+		names := make([]string, len(prefix))
+		for i, c := range prefix {
+			names[i] = c.Def.Name
+		}
+		return nil, "Ambiguous — matches: " + strings.Join(names, ", ") + "."
+	}
+}
+
+func (p *AdventurePlugin) handleConsumeCmd(ctx MessageContext, args string) error {
+	userMu := p.advUserLock(ctx.Sender)
+	userMu.Lock()
+	defer userMu.Unlock()
+
+	sess, err := getActiveCombatSession(ctx.Sender)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't read combat state: "+err.Error())
+	}
+	if sess == nil {
+		return p.SendDM(ctx.Sender, "`!consume <item>` spends an item on your turn in an Elite or Boss fight. You're not in one — outside combat, consumables fire automatically.")
+	}
+
+	inv := p.loadConsumableInventory(ctx.Sender)
+	args = strings.TrimSpace(args)
+	if args == "" {
+		if len(inv) == 0 {
+			return p.SendDM(ctx.Sender, "You have no combat consumables. `!attack` / `!cast` / `!flee`.")
+		}
+		names := make([]string, len(inv))
+		for i, c := range inv {
+			names[i] = c.Def.Name
+		}
+		return p.SendDM(ctx.Sender, "Usage: `!consume <item>`. You're carrying: "+strings.Join(names, ", ")+".")
+	}
+
+	item, ambig := matchConsumable(inv, args)
+	if ambig != "" {
+		return p.SendDM(ctx.Sender, ambig)
+	}
+	if item == nil {
+		return p.SendDM(ctx.Sender, fmt.Sprintf("No consumable matching %q in your inventory.", args))
+	}
+
+	def := item.Def
+	player, enemy, err := p.combatantsForSession(sess)
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't rebuild the fight: "+err.Error())
+	}
+
+	eff := &turnActionEffect{Action: "use_consumable"}
+	switch def.Effect {
+	case EffectHeal:
+		eff.PlayerHeal = int(def.Value)
+		eff.Label = fmt.Sprintf("%s — +%d HP", def.Name, eff.PlayerHeal)
+	case EffectFlatDmg:
+		eff.EnemyDamage = int(def.Value)
+		eff.Label = fmt.Sprintf("%s — %d damage", def.Name, eff.EnemyDamage)
+	default:
+		// Buff-type consumable — resolve the marginal effect against a
+		// throwaway combatant, fold it into the session's persisted state, and
+		// rebuild the pair so the buff is live for this round's enemy turn.
+		as, am := player.Stats, player.Mods
+		ApplyConsumableMods(&as, &am, []ConsumableItem{{Def: def}})
+		d := diffTurnBuff(player.Stats, as, player.Mods, am)
+		if !d.any() {
+			return p.SendDM(ctx.Sender, fmt.Sprintf(
+				"**%s** has no effect the turn-based engine can apply yet.", def.Name))
+		}
+		sess.Statuses.applyBuffDelta(d)
+		player, enemy, err = p.combatantsForSession(sess)
+		if err != nil {
+			return p.SendDM(ctx.Sender, "Couldn't rebuild the fight: "+err.Error())
+		}
+		eff.Label = def.Name + " — active"
+		eff.PlayerHeal = d.heal
+		eff.EnemySkip = d.enemySkip
+	}
+
+	events, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionConsume, Effect: eff})
+	if err != nil {
+		return p.SendDM(ctx.Sender, "Couldn't resolve the round: "+err.Error())
+	}
+	// Round resolved and persisted — now burn the item. A removal failure here
+	// leaves the player a free use (logged, rare); better than charging them
+	// for a round that errored out.
+	if rerr := removeAdvInventoryItem(item.InventoryID); rerr != nil {
+		slog.Error("combat: consume remove inventory item failed", "user", ctx.Sender, "item", def.Name, "err", rerr)
+	}
+	return p.SendDM(ctx.Sender, p.renderRoundResult(ctx.Sender, sess, events, player.Name, enemy))
+}

internal/plugin/combat_cmd_test.go

@@ -0,0 +1,273 @@
+package plugin
+
+import (
+	"strings"
+	"testing"
+
+	"maunium.net/go/mautrix/id"
+)
+
+func TestEncounterIDForRoom(t *testing.T) {
+	if got := encounterIDForRoom(0); got != "room0" {
+		t.Errorf("encounterIDForRoom(0) = %q, want room0", got)
+	}
+	if encounterIDForRoom(3) == encounterIDForRoom(4) {
+		t.Error("distinct rooms must produce distinct encounter ids")
+	}
+}
+
+// ── getCombatSessionForEncounter ───────────────────────────────────────────
+
+func TestGetCombatSessionForEncounter(t *testing.T) {
+	setupZoneRunTestDB(t)
+	uid := id.UserID("@combat-enc:example.org")
+	defer cleanupCombatSessions(uid)
+
+	if got, err := getCombatSessionForEncounter("run-enc", "room3"); err != nil || got != nil {
+		t.Fatalf("unknown encounter: got %v / %v, want nil/nil", got, err)
+	}
+
+	s, err := startCombatSession(uid, "run-enc", "room3", "goblin", 40, 40, 12, 12)
+	if err != nil {
+		t.Fatal(err)
+	}
+	got, err := getCombatSessionForEncounter("run-enc", "room3")
+	if err != nil || got == nil {
+		t.Fatalf("getCombatSessionForEncounter: %v / %v", got, err)
+	}
+	if got.SessionID != s.SessionID {
+		t.Errorf("id mismatch: %q vs %q", got.SessionID, s.SessionID)
+	}
+	if got, _ := getCombatSessionForEncounter("run-enc", "room9"); got != nil {
+		t.Errorf("wrong room should not match: %+v", got)
+	}
+
+	// A terminal session is still returned — the room resolver relies on this
+	// to tell "already won" apart from "not yet fought".
+	s.Status = CombatStatusWon
+	s.Phase = CombatPhaseOver
+	if err := saveCombatSession(s); err != nil {
+		t.Fatal(err)
+	}
+	got, err = getCombatSessionForEncounter("run-enc", "room3")
+	if err != nil || got == nil || got.Status != CombatStatusWon {
+		t.Errorf("terminal session lookup: %+v / %v", got, err)
+	}
+}
+
+// ── runCombatRound ─────────────────────────────────────────────────────────
+
+func TestRunCombatRound_FullRoundReturnsToPlayerTurn(t *testing.T) {
+	setupZoneRunTestDB(t)
+	uid := id.UserID("@combat-round:example.org")
+	defer cleanupCombatSessions(uid)
+
+	// HP pools large enough that one round can't end the fight.
+	sess, err := startCombatSession(uid, "r", "room0", "goblin", 100000, 100000, 100000, 100000)
+	if err != nil {
+		t.Fatal(err)
+	}
+	player, enemy := basePlayer(), baseEnemy()
+
+	events, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionAttack})
+	if err != nil {
+		t.Fatalf("runCombatRound: %v", err)
+	}
+	if !sess.IsActive() {
+		t.Fatalf("status = %q, want active after one non-lethal round", sess.Status)
+	}
+	if sess.Phase != CombatPhasePlayerTurn {
+		t.Errorf("phase = %q, want player_turn (round resolved fully)", sess.Phase)
+	}
+	if sess.Round != 2 {
+		t.Errorf("round = %d, want 2 after one full round", sess.Round)
+	}
+	if len(events) == 0 {
+		t.Error("expected the round to produce at least one event")
+	}
+	// The persisted row should match the in-memory session.
+	reloaded, _ := getCombatSession(sess.SessionID)
+	if reloaded == nil || reloaded.Round != 2 || reloaded.Phase != CombatPhasePlayerTurn {
+		t.Errorf("round not persisted: %+v", reloaded)
+	}
+}
+
+func TestRunCombatRound_FleeEndsFight(t *testing.T) {
+	setupZoneRunTestDB(t)
+	uid := id.UserID("@combat-flee:example.org")
+	defer cleanupCombatSessions(uid)
+
+	sess, err := startCombatSession(uid, "r", "room0", "goblin", 50, 50, 50, 50)
+	if err != nil {
+		t.Fatal(err)
+	}
+	player, enemy := basePlayer(), baseEnemy()
+
+	events, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionFlee})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if sess.Status != CombatStatusFled || sess.Phase != CombatPhaseOver {
+		t.Errorf("after flee: status=%q phase=%q", sess.Status, sess.Phase)
+	}
+	if len(events) != 1 || events[0].Action != "flee" {
+		t.Errorf("expected one flee event, got %+v", events)
+	}
+}
+
+func TestRunCombatRound_PlayerWinsTerminates(t *testing.T) {
+	setupZoneRunTestDB(t)
+	uid := id.UserID("@combat-win:example.org")
+	defer cleanupCombatSessions(uid)
+
+	// Enemy on 1 HP, player with a huge pool: a connecting hit ends it, and
+	// the player can't be dropped first. A few rounds covers attack misses.
+	sess, err := startCombatSession(uid, "r", "room0", "goblin", 100000, 100000, 1, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	player, enemy := basePlayer(), baseEnemy()
+
+	for i := 0; i < 15 && sess.IsActive(); i++ {
+		if _, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionAttack}); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if sess.Status != CombatStatusWon {
+		t.Fatalf("status = %q, want won", sess.Status)
+	}
+	if sess.Phase != CombatPhaseOver || sess.EnemyHP > 0 {
+		t.Errorf("terminal state wrong: phase=%q enemyHP=%d", sess.Phase, sess.EnemyHP)
+	}
+}
+
+// ── runCombatRound: !cast / !consume turn effects ─────────────────────────
+
+func TestRunCombatRound_ConsumeHealClampsToMax(t *testing.T) {
+	setupZoneRunTestDB(t)
+	uid := id.UserID("@combat-heal:example.org")
+	defer cleanupCombatSessions(uid)
+
+	// Player at 10/50, big enemy pool so the round can't end the fight.
+	sess, err := startCombatSession(uid, "r", "room0", "goblin", 10, 50, 100000, 100000)
+	if err != nil {
+		t.Fatal(err)
+	}
+	player, enemy := basePlayer(), baseEnemy()
+
+	eff := &turnActionEffect{Action: "use_consumable", Label: "Spirit Tonic", PlayerHeal: 1000}
+	if _, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionConsume, Effect: eff}); err != nil {
+		t.Fatal(err)
+	}
+	// Heal of 1000 must clamp to PlayerHPMax, even after the enemy's swing this
+	// round chipped some HP back off.
+	if sess.PlayerHP > sess.PlayerHPMax {
+		t.Errorf("playerHP = %d exceeds max %d", sess.PlayerHP, sess.PlayerHPMax)
+	}
+	if sess.PlayerHP <= 10 {
+		t.Errorf("playerHP = %d, expected the heal to raise it above the 10 it started at", sess.PlayerHP)
+	}
+}
+
+func TestRunCombatRound_CastDamageKillsEnemy(t *testing.T) {
+	setupZoneRunTestDB(t)
+	uid := id.UserID("@combat-cast-kill:example.org")
+	defer cleanupCombatSessions(uid)
+
+	sess, err := startCombatSession(uid, "r", "room0", "goblin", 100000, 100000, 30, 30)
+	if err != nil {
+		t.Fatal(err)
+	}
+	player, enemy := basePlayer(), baseEnemy()
+
+	eff := &turnActionEffect{Action: "spell_cast", Label: "Fireball — 99 dmg", EnemyDamage: 99}
+	events, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionCast, Effect: eff})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if sess.Status != CombatStatusWon || sess.Phase != CombatPhaseOver {
+		t.Errorf("after lethal cast: status=%q phase=%q", sess.Status, sess.Phase)
+	}
+	if sess.EnemyHP > 0 {
+		t.Errorf("enemyHP = %d, want 0", sess.EnemyHP)
+	}
+	if len(events) != 1 || events[0].Action != "spell_cast" {
+		t.Errorf("expected a single spell_cast event, got %+v", events)
+	}
+}
+
+func TestRunCombatRound_CastControlSkipsEnemyTurn(t *testing.T) {
+	setupZoneRunTestDB(t)
+	uid := id.UserID("@combat-control:example.org")
+	defer cleanupCombatSessions(uid)
+
+	sess, err := startCombatSession(uid, "r", "room0", "goblin", 200, 200, 100000, 100000)
+	if err != nil {
+		t.Fatal(err)
+	}
+	player, enemy := basePlayer(), baseEnemy()
+	hpBefore := sess.PlayerHP
+
+	eff := &turnActionEffect{Action: "spell_cast", Label: "Hold Person — controlled", EnemySkip: true}
+	events, err := runCombatRound(sess, &player, &enemy, PlayerAction{Kind: ActionCast, Effect: eff})
+	if err != nil {
+		t.Fatal(err)
+	}
+	// The enemy forfeits its swing this round, so the player takes no damage.
+	if sess.PlayerHP != hpBefore {
+		t.Errorf("playerHP = %d, want unchanged %d (enemy was held)", sess.PlayerHP, hpBefore)
+	}
+	held := false
+	for _, ev := range events {
+		if ev.Action == "spell_held" {
+			held = true
+		}
+	}
+	if !held {
+		t.Errorf("expected a spell_held event, got %+v", events)
+	}
+	// The skip is a one-round effect — it must not persist into the next round.
+	if sess.Statuses.EnemySkipNext {
+		t.Error("EnemySkipNext should be cleared once the enemy turn consumed it")
+	}
+	if !sess.IsActive() || sess.Phase != CombatPhasePlayerTurn {
+		t.Errorf("fight should continue: status=%q phase=%q", sess.Status, sess.Phase)
+	}
+}
+
+// ── RenderTurnRound ────────────────────────────────────────────────────────
+
+func TestRenderTurnRound(t *testing.T) {
+	if got := RenderTurnRound(nil, "Hero", "Goblin"); !strings.Contains(got, "without a clean blow") {
+		t.Errorf("empty events render = %q", got)
+	}
+	events := []CombatEvent{
+		{Actor: "player", Action: "hit", Damage: 9},
+		{Actor: "enemy", Action: "miss"},
+		{Actor: "enemy", Action: "poison_tick", Damage: 3},
+	}
+	got := RenderTurnRound(events, "Hero", "Goblin")
+	// One line per event (damage events interpolate their amount; the random
+	// pool choice is what varies, so assert structure + the damage numbers
+	// rather than specific flavor strings).
+	if lines := strings.Count(got, "\n"); lines != 2 {
+		t.Errorf("expected 3 lines, got %d: %q", lines+1, got)
+	}
+	if !strings.Contains(got, "9") {
+		t.Errorf("player hit damage not rendered: %q", got)
+	}
+	if !strings.Contains(got, "3") {
+		t.Errorf("poison tick damage not rendered: %q", got)
+	}
+	// Turn-specific actions get their own pools.
+	cast := RenderTurnRound([]CombatEvent{
+		{Actor: "player", Action: "spell_cast", Desc: "Fireball — 24 dmg", Damage: 24},
+	}, "Hero", "Goblin")
+	if !strings.Contains(cast, "Fireball — 24 dmg") {
+		t.Errorf("spell_cast label not rendered: %q", cast)
+	}
+	flee := RenderTurnRound([]CombatEvent{{Actor: "player", Action: "flee"}}, "Hero", "Goblin")
+	if flee == "" || strings.Contains(flee, "without a clean blow") {
+		t.Errorf("flee should render a line: %q", flee)
+	}
+}

internal/plugin/combat_debug.go

@@ -0,0 +1,44 @@
+package plugin
+
+import (
+	"fmt"
+	"log/slog"
+	"os"
+	"strings"
+)
+
+// dumpCombatEventsIfDebug logs every event in a CombatResult to slog.Info
+// when GOGOBEE_COMBAT_DEBUG=1 is set. Renders one event per line in a
+// compact form: "[round phase actor.action] hp=P/E roll=R vsAC=V dmg=D desc".
+//
+// Used to diagnose ghost damage / dropped events: the renderer silently
+// returns "" for unknown actions, which makes damage that hit the engine
+// state but never reached the chat invisible. This dump shows everything.
+func dumpCombatEventsIfDebug(label string, result CombatResult) {
+	if os.Getenv("GOGOBEE_COMBAT_DEBUG") != "1" {
+		return
+	}
+	var b strings.Builder
+	b.WriteString(fmt.Sprintf("\n=== combat dump: %s ===\n", label))
+	b.WriteString(fmt.Sprintf("PlayerStartHP=%d PlayerEntryHP=%d EnemyStartHP=%d EnemyEntryHP=%d PlayerEndHP=%d EnemyEndHP=%d won=%v\n",
+		result.PlayerStartHP, result.PlayerEntryHP, result.EnemyStartHP, result.EnemyEntryHP,
+		result.PlayerEndHP, result.EnemyEndHP, result.PlayerWon))
+	prevP := result.PlayerEntryHP
+	if prevP == 0 {
+		prevP = result.PlayerStartHP
+	}
+	prevE := result.EnemyEntryHP
+	if prevE == 0 {
+		prevE = result.EnemyStartHP
+	}
+	for i, e := range result.Events {
+		dp := e.PlayerHP - prevP
+		de := e.EnemyHP - prevE
+		b.WriteString(fmt.Sprintf("  %3d [r%d %s %s.%s] hp=%d/%d (Δp=%+d Δe=%+d) roll=%d vsAC=%d dmg=%d desc=%q\n",
+			i, e.Round, e.Phase, e.Actor, e.Action, e.PlayerHP, e.EnemyHP, dp, de,
+			e.Roll, e.RollAgainst, e.Damage, e.Desc))
+		prevP, prevE = e.PlayerHP, e.EnemyHP
+	}
+	b.WriteString("=== end dump ===\n")
+	slog.Info("combat debug dump", "log", b.String())
+}

internal/plugin/combat_engine_characterization_test.go

@@ -0,0 +1,296 @@
+package plugin
+
+// Characterization test for the auto-resolve combat engine.
+//
+// This pins the *exact* event stream SimulateCombat produces for a curated set
+// of scenarios, driven by a seeded RNG so the output is reproducible. It is a
+// safety net for the upcoming shared-primitives extraction (turn-based engine
+// work): any change that perturbs the auto-resolve event sequence will fail
+// here, forcing a deliberate `-update` regeneration + diff review.
+//
+// It asserts behavior, not correctness — a failing diff means "you changed
+// something", not "you broke something". Review the diff, and if the change is
+// intended, regenerate with:
+//
+//	go test ./internal/plugin -run TestCombatCharacterization -update
+
+import (
+	"flag"
+	"fmt"
+	"math/rand/v2"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+var updateCharacterization = flag.Bool("update", false, "regenerate combat characterization golden file")
+
+// charScenario is one pinned combat setup. The same player/enemy/phases are
+// run across a fixed set of seeds so the snapshot captures multiple RNG
+// branches (hit/miss/crit/proc) of the same configuration.
+type charScenario struct {
+	name   string
+	player Combatant
+	enemy  Combatant
+	phases []CombatPhase
+}
+
+func characterizationScenarios() []charScenario {
+	// Local builders so the scenarios don't depend on mutation order of the
+	// shared basePlayer()/baseEnemy() helpers.
+	weaponPlayer := func() Combatant {
+		p := basePlayer()
+		p.Stats.Weapon = weaponByID("wpn_longsword")
+		return p
+	}
+
+	return []charScenario{
+		{"basic", basePlayer(), baseEnemy(), defaultCombatPhases},
+		{"dungeon_phases", basePlayer(), baseEnemy(), dungeonCombatPhases},
+		{"boss_phases", func() Combatant {
+			e := baseEnemy()
+			e.Stats.MaxHP = 220
+			e.Stats.Attack = 22
+			return basePlayer()
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Name = "Boss"
+			e.Stats.MaxHP = 220
+			e.Stats.Attack = 22
+			return e
+		}(), bossCombatPhases},
+		{"strong_enemy", func() Combatant {
+			p := basePlayer()
+			p.Stats.MaxHP = 50
+			p.Stats.Attack = 8
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.MaxHP = 200
+			e.Stats.Attack = 30
+			e.Stats.Defense = 12
+			return e
+		}(), defaultCombatPhases},
+		{"sniper_kill", func() Combatant {
+			p := basePlayer()
+			p.Mods.SniperKillProc = 1.0
+			return p
+		}(), baseEnemy(), defaultCombatPhases},
+		{"flat_dmg_start", func() Combatant {
+			p := basePlayer()
+			p.Mods.FlatDmgStart = 20
+			return p
+		}(), baseEnemy(), defaultCombatPhases},
+		{"spell_pre_damage", func() Combatant {
+			p := basePlayer()
+			p.Mods.SpellPreDamage = 18
+			p.Mods.SpellPreDamageDesc = "Fireball"
+			return p
+		}(), baseEnemy(), defaultCombatPhases},
+		{"spell_enemy_skip_first", func() Combatant {
+			p := basePlayer()
+			p.Mods.SpellPreDamage = 5
+			p.Mods.SpellPreDamageDesc = "Hold Person"
+			p.Mods.SpellEnemySkipFirst = true
+			return p
+		}(), baseEnemy(), defaultCombatPhases},
+		{"heal_item", func() Combatant {
+			p := basePlayer()
+			p.Mods.HealItem = 30
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.Attack = 20
+			return e
+		}(), defaultCombatPhases},
+		{"ward_absorb", func() Combatant {
+			p := basePlayer()
+			p.Mods.WardCharges = 1
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.Attack = 30
+			return e
+		}(), defaultCombatPhases},
+		{"spore_cloud", func() Combatant {
+			p := basePlayer()
+			p.Mods.SporeCloud = 10
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.Attack = 15
+			return e
+		}(), defaultCombatPhases},
+		{"reflect_next", func() Combatant {
+			p := basePlayer()
+			p.Mods.ReflectNext = 0.5
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.Attack = 20
+			return e
+		}(), defaultCombatPhases},
+		{"auto_crit_first", func() Combatant {
+			p := basePlayer()
+			p.Mods.AutoCritFirst = true
+			p.Stats.CritRate = 0
+			return p
+		}(), baseEnemy(), defaultCombatPhases},
+		{"pet_attack", func() Combatant {
+			p := basePlayer()
+			p.Mods.PetAttackProc = 1.0
+			p.Mods.PetAttackDmg = 10
+			return p
+		}(), baseEnemy(), defaultCombatPhases},
+		{"misty_heal", func() Combatant {
+			p := basePlayer()
+			p.Mods.MistyHealProc = 1.0
+			p.Mods.MistyHealAmt = 10
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.Attack = 15
+			return e
+		}(), defaultCombatPhases},
+		{"death_save", func() Combatant {
+			p := basePlayer()
+			p.Stats.MaxHP = 30
+			p.Mods.DeathSave = true
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.Attack = 40
+			e.Stats.MaxHP = 200
+			return e
+		}(), defaultCombatPhases},
+		{"ability_poison", basePlayer(), func() Combatant {
+			e := baseEnemy()
+			e.Ability = &MonsterAbility{Name: "Venom Bite", Phase: "any", ProcChance: 1.0, Effect: "poison"}
+			return e
+		}(), defaultCombatPhases},
+		{"ability_enrage", func() Combatant {
+			p := basePlayer()
+			p.Stats.Attack = 12
+			return p
+		}(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.MaxHP = 50
+			e.Stats.Attack = 6
+			e.Ability = &MonsterAbility{Name: "Berserk", Phase: "any", ProcChance: 1.0, Effect: "enrage"}
+			return e
+		}(), defaultCombatPhases},
+		{"ability_armor_break", basePlayer(), func() Combatant {
+			e := baseEnemy()
+			e.Ability = &MonsterAbility{Name: "Rend", Phase: "opening", ProcChance: 1.0, Effect: "armor_break"}
+			return e
+		}(), defaultCombatPhases},
+		{"ability_stun", basePlayer(), func() Combatant {
+			e := baseEnemy()
+			e.Ability = &MonsterAbility{Name: "Bash", Phase: "any", ProcChance: 1.0, Effect: "stun"}
+			return e
+		}(), defaultCombatPhases},
+		{"ability_lifesteal", basePlayer(), func() Combatant {
+			e := baseEnemy()
+			e.Stats.MaxHP = 100
+			e.Ability = &MonsterAbility{Name: "Drain", Phase: "any", ProcChance: 1.0, Effect: "lifesteal"}
+			return e
+		}(), defaultCombatPhases},
+		{"ability_cleave", basePlayer(), func() Combatant {
+			e := baseEnemy()
+			e.Ability = &MonsterAbility{Name: "Cleave", Phase: "clash", ProcChance: 1.0, Effect: "cleave"}
+			return e
+		}(), defaultCombatPhases},
+		{"weapon_profile", weaponPlayer(), baseEnemy(), defaultCombatPhases},
+	}
+}
+
+// charSeeds drives each scenario. Multiple seeds widen RNG-branch coverage
+// without exploding the golden file.
+var charSeeds = []uint64{1, 2, 3, 7, 42}
+
+func TestCombatCharacterization(t *testing.T) {
+	var b strings.Builder
+	for _, sc := range characterizationScenarios() {
+		for _, seed := range charSeeds {
+			// PCG with a per-(scenario,seed) stream so scenarios don't share
+			// a sequence. The literal constant just disambiguates the stream.
+			rng := rand.New(rand.NewPCG(seed, 0xC0FFEE))
+			res := simulateCombatWithRNG(sc.player, sc.enemy, sc.phases, rng)
+			fmt.Fprintf(&b, "=== %s seed=%d ===\n", sc.name, seed)
+			b.WriteString(formatResult(res))
+			b.WriteString("\n")
+		}
+	}
+	got := b.String()
+
+	goldenPath := filepath.Join("testdata", "combat_characterization.golden")
+	if *updateCharacterization {
+		if err := os.WriteFile(goldenPath, []byte(got), 0o644); err != nil {
+			t.Fatalf("write golden: %v", err)
+		}
+		t.Logf("updated %s", goldenPath)
+		return
+	}
+
+	want, err := os.ReadFile(goldenPath)
+	if err != nil {
+		t.Fatalf("read golden (run with -update to create): %v", err)
+	}
+	if got != string(want) {
+		t.Errorf("combat event stream diverged from golden file.\n"+
+			"If this change is intentional, regenerate with:\n"+
+			"  go test ./internal/plugin -run TestCombatCharacterization -update\n"+
+			"then review the diff.\n\n%s", firstDiff(string(want), got))
+	}
+}
+
+// formatResult serializes a CombatResult to a stable, line-oriented text form.
+// Every event is dumped; summary fields follow. Field order is fixed so a diff
+// pinpoints exactly what moved.
+func formatResult(r CombatResult) string {
+	var b strings.Builder
+	fmt.Fprintf(&b, "result: won=%v timedOut=%v rounds=%d\n", r.PlayerWon, r.TimedOut, r.TotalRounds)
+	fmt.Fprintf(&b, "  hp: playerStart=%d playerEntry=%d playerEnd=%d enemyStart=%d enemyEntry=%d enemyEnd=%d\n",
+		r.PlayerStartHP, r.PlayerEntryHP, r.PlayerEndHP, r.EnemyStartHP, r.EnemyEntryHP, r.EnemyEndHP)
+	fmt.Fprintf(&b, "  flags: nearDeath=%v pet=%v petDeflect=%v sniper=%v misty=%v closeness=%.4f\n",
+		r.NearDeath, r.PetAttacked, r.PetDeflected, r.SniperKilled, r.MistyHealed, r.Closeness)
+	for i, e := range r.Events {
+		fmt.Fprintf(&b, "  [%02d] r%d %-12s %-8s %-16s dmg=%-5d php=%-4d ehp=%-4d roll=%d/%d desc=%q\n",
+			i, e.Round, e.Phase, e.Actor, e.Action, e.Damage, e.PlayerHP, e.EnemyHP, e.Roll, e.RollAgainst, e.Desc)
+	}
+	return b.String()
+}
+
+// firstDiff returns a short window around the first differing line, so test
+// output points straight at the divergence instead of dumping the whole file.
+func firstDiff(want, got string) string {
+	wl := strings.Split(want, "\n")
+	gl := strings.Split(got, "\n")
+	for i := 0; i < len(wl) || i < len(gl); i++ {
+		var w, g string
+		if i < len(wl) {
+			w = wl[i]
+		}
+		if i < len(gl) {
+			g = gl[i]
+		}
+		if w != g {
+			lo := i - 3
+			if lo < 0 {
+				lo = 0
+			}
+			var b strings.Builder
+			fmt.Fprintf(&b, "first divergence at line %d:\n", i+1)
+			for j := lo; j < i; j++ {
+				if j < len(gl) {
+					fmt.Fprintf(&b, "  ctx: %s\n", gl[j])
+				}
+			}
+			fmt.Fprintf(&b, "  want: %s\n", w)
+			fmt.Fprintf(&b, "  got:  %s\n", g)
+			return b.String()
+		}
+	}
+	return "(files differ but no line-level diff found — trailing whitespace?)"
+}