mirror of
https://github.com/prosolis/gogobee.git
synced 2026-07-15 08:32:41 +00:00
Tedium-removal pass driven by live play feedback. Three big threads: Expedition autopilot Phase 4 — background auto-run + harvest-until-dry: - New expeditionAutoRunTicker walks active expeditions every 15min (5min tick, per-expedition CAS on new last_autorun_at column). Skips combat sessions, briefing/recap quiet windows, expeditions <30min old. - Walks up to 3 rooms/tick with compact narration; suppresses DMs when 0 rooms walked or just hitting the per-tick cap (no "stretch complete" filler). Player only hears from the bot when a real decision is needed. - Compact mode: one-line combat narration for trash/elite, auto-resolves elite doorways via the forward-sim engine (boss still pauses). Threaded via new advanceOnceWithOpts → resolveRoom → resolveCombatRoom. - Auto-harvest now grinds each Common/Uncommon node until dry (cap at 8 attempts/visit), mirroring manual !scavenge retries. Rare+ still pauses. - Ambient ticker: anti-repeat by Kind via new last_ambient_kind column (avoids two pack_rat DMs in a row when the pool only has 6 lines). - !expedition go <n> now routes to the fork-choice handler when active + numeric; fork footer rewritten to suggest !expedition go instead of !zone go. Boss/Elite doorway: formatNextRoomMessage routes the action hint by next room type and autopilot loop breaks via new nextRoomType field so "Room X/Y — Boss" doesn't double-print with contradictory hints (!zone advance vs !fight). - runAutopilotWalk extracted from expeditionCmdRun so foreground and background share the loop body. Rogue Sneak Attack actually exists now: - Audit found the rogue's "Sneak Attack" passive was AutoCritFirst + 5% damage rider. No Nd6, ever. Phase 2 Monte Carlo masked this with a small flat buff; the class's defining mechanic never matched its tooltip or 5e identity. - Added SneakAttackDie int to CombatModifiers, per-hit Nd6 in combat_primitives.go (same lane as DivineStrikePerHit). Scales with level: 1d6 at L1-2 ... 4d6 at L7-8 ... capped at 10d6 at L19-20. - AutoCritFirst + 5% rider retained as bonuses on top of working sneak attack — preserves the opener-burst feel. - L7 rogue expected per-hit ~8 → ~22 damage. Valdris fight math goes from "16 rounds to kill, die in 8" to winnable. TwinBee voice sweep (Phase B3): - ~530 line changes across 24 files replacing third-person "TwinBee notes/files/tracks/respects/..." constructions with first-person inside flavor string literals. Code identifiers (TwinBeeLine, twinBeeLine, etc.), chat-prefix labels (🎭 **TwinBee:**), item names (TwinBee's Bell), achievements, and game-title references in fun.go (Konami TwinBee ship) left intact. - Catches a real bug: Valdris fight rendered "TwinBee marks the Legendary Resistance" mid-combat in third person, contradicting the Phase B2 convention. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
261 lines
9.5 KiB
Go
261 lines
9.5 KiB
Go
package plugin
|
|
|
|
import (
|
|
"database/sql"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"gogobee/internal/db"
|
|
"gogobee/internal/flavor"
|
|
"maunium.net/go/mautrix/id"
|
|
)
|
|
|
|
// Phase 12 E5 — Extraction & Resume.
|
|
// Spec: gogobee_expedition_system.md §10.
|
|
//
|
|
// - Voluntary (§10.1): !extract — burns 1 in-game day, status='extracting',
|
|
// resumable for 7 real days. All loot/XP/coins kept.
|
|
// - Forced (§10.2): triggered by HP-0 / supplies-0 / Abyss collapse.
|
|
// status='abandoned', 20% coin tax on CoinsEarned, NOT resumable.
|
|
// - Resume (§10.3): !resume within 7 days, repurchase supplies, threat
|
|
// and temporal stacks restored as-is.
|
|
//
|
|
// HP-0 and supplies-0 wiring lives with combat / supply hookups (deferred);
|
|
// this commit ships the helpers and wires the existing Abyss-collapse path.
|
|
|
|
const (
|
|
extractResumeWindow = 7 * 24 * time.Hour
|
|
forcedExtractCoinTaxFrac = 0.20
|
|
)
|
|
|
|
var (
|
|
ErrNoResumableExpedition = errors.New("no resumable expedition for player")
|
|
ErrResumeWindowExpired = errors.New("expedition resume window expired (7 days)")
|
|
)
|
|
|
|
// voluntaryExtractExpedition burns one in-game day's supplies, advances
|
|
// the day counter, and flips status to 'extracting'. The expedition stays
|
|
// resumable until completed_at + 7 days.
|
|
func voluntaryExtractExpedition(userID id.UserID) (*Expedition, error) {
|
|
e, err := getActiveExpedition(userID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if e == nil {
|
|
return nil, ErrNoActiveExpedition
|
|
}
|
|
harsh := e.ThreatLevel > 60
|
|
newSupplies, _ := applyDailyBurn(e.Supplies, harsh, e.SiegeMode)
|
|
e.Supplies = newSupplies
|
|
supJSON, _ := json.Marshal(newSupplies)
|
|
if _, err := db.Get().Exec(`
|
|
UPDATE dnd_expedition
|
|
SET status = 'extracting',
|
|
supplies_json = ?,
|
|
current_day = current_day + 1,
|
|
completed_at = CURRENT_TIMESTAMP,
|
|
last_activity = CURRENT_TIMESTAMP
|
|
WHERE expedition_id = ?`, string(supJSON), e.ID); err != nil {
|
|
return nil, fmt.Errorf("voluntary extract: %w", err)
|
|
}
|
|
e.CurrentDay++
|
|
e.Status = ExpeditionStatusExtracting
|
|
_ = retireAllRegionRuns(e)
|
|
return e, nil
|
|
}
|
|
|
|
// forcedExtractExpedition flips an expedition to 'abandoned'. Returns the
|
|
// 20% coin-tax amount the caller should debit (CoinsEarned * 0.20, floored).
|
|
// Reason is appended to the expedition log.
|
|
func forcedExtractExpedition(expID, reason string) (*Expedition, int, error) {
|
|
e, err := getExpedition(expID)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
if e == nil {
|
|
return nil, 0, ErrNoActiveExpedition
|
|
}
|
|
tax := int(float64(e.CoinsEarned) * forcedExtractCoinTaxFrac)
|
|
if _, err := db.Get().Exec(`
|
|
UPDATE dnd_expedition
|
|
SET status = 'abandoned',
|
|
completed_at = CURRENT_TIMESTAMP,
|
|
last_activity = CURRENT_TIMESTAMP
|
|
WHERE expedition_id = ?`, expID); err != nil {
|
|
return nil, 0, fmt.Errorf("forced extract: %w", err)
|
|
}
|
|
e.Status = ExpeditionStatusAbandoned
|
|
_ = retireAllRegionRuns(e)
|
|
return e, tax, nil
|
|
}
|
|
|
|
// getResumableExpedition returns the most recent 'extracting' row for the
|
|
// user, regardless of age (caller checks the 7-day window).
|
|
func getResumableExpedition(userID id.UserID) (*Expedition, error) {
|
|
row := db.Get().QueryRow(`
|
|
SELECT expedition_id, user_id, zone_id, run_id, status,
|
|
start_date, current_day, current_region, boss_defeated,
|
|
supplies_json, camp_json, threat_level, threat_siege,
|
|
threat_events, temporal_stack, region_state,
|
|
xp_earned, coins_earned, gm_mood,
|
|
last_briefing_at, last_recap_at, last_ambient_kind,
|
|
last_activity, completed_at
|
|
FROM dnd_expedition
|
|
WHERE user_id = ?
|
|
AND status = 'extracting'
|
|
ORDER BY completed_at DESC
|
|
LIMIT 1`, string(userID))
|
|
e, err := scanExpedition(row)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, nil
|
|
}
|
|
return e, err
|
|
}
|
|
|
|
// resumeExpedition flips an extracting row back to 'active' with fresh
|
|
// supplies. Threat/temporal/region state are preserved as-is.
|
|
func resumeExpedition(expID string, supplies ExpeditionSupplies) error {
|
|
supJSON, _ := json.Marshal(supplies)
|
|
_, err := db.Get().Exec(`
|
|
UPDATE dnd_expedition
|
|
SET status = 'active',
|
|
supplies_json = ?,
|
|
completed_at = NULL,
|
|
last_activity = CURRENT_TIMESTAMP
|
|
WHERE expedition_id = ?`, string(supJSON), expID)
|
|
return err
|
|
}
|
|
|
|
// ── !extract command ────────────────────────────────────────────────────────
|
|
|
|
func (p *AdventurePlugin) handleExtractCmd(ctx MessageContext, _ string) error {
|
|
userMu := p.advUserLock(ctx.Sender)
|
|
userMu.Lock()
|
|
defer userMu.Unlock()
|
|
|
|
exp, err := getActiveExpedition(ctx.Sender)
|
|
if err != nil {
|
|
return p.SendDM(ctx.Sender, "Couldn't read expedition state: "+err.Error())
|
|
}
|
|
if exp == nil {
|
|
return p.SendDM(ctx.Sender, "No active expedition to extract from.")
|
|
}
|
|
zone, _ := getZone(exp.ZoneID)
|
|
updated, err := voluntaryExtractExpedition(ctx.Sender)
|
|
if err != nil {
|
|
return p.SendDM(ctx.Sender, "Couldn't extract: "+err.Error())
|
|
}
|
|
line := flavor.Pick(flavor.ExtractionVoluntary)
|
|
_ = appendExpeditionLog(updated.ID, updated.CurrentDay, "narrative",
|
|
"voluntary extraction", line)
|
|
|
|
var b strings.Builder
|
|
b.WriteString(fmt.Sprintf("🚪 **Extraction — %s, Day %d**\n\n",
|
|
zone.Display, updated.CurrentDay))
|
|
if line != "" {
|
|
b.WriteString(line)
|
|
b.WriteString("\n\n")
|
|
}
|
|
b.WriteString(fmt.Sprintf("Loot, XP, and coins are kept. The dungeon stays where you left it — `!resume` within 7 days to come back. After %s the expedition expires.",
|
|
(time.Now().UTC().Add(extractResumeWindow)).Format("2006-01-02 15:04 MST")))
|
|
return p.SendDM(ctx.Sender, b.String())
|
|
}
|
|
|
|
// ── !resume command ─────────────────────────────────────────────────────────
|
|
|
|
func (p *AdventurePlugin) handleResumeCmd(ctx MessageContext, args string) error {
|
|
userMu := p.advUserLock(ctx.Sender)
|
|
userMu.Lock()
|
|
defer userMu.Unlock()
|
|
|
|
c, err := LoadDnDCharacter(ctx.Sender)
|
|
if err != nil {
|
|
return p.SendDM(ctx.Sender, "Couldn't load your character: "+err.Error())
|
|
}
|
|
if c == nil || c.PendingSetup {
|
|
return p.SendDM(ctx.Sender, "No Adv 2.0 character yet — run `!setup` first.")
|
|
}
|
|
|
|
if existing, _ := getActiveExpedition(ctx.Sender); existing != nil {
|
|
zone, _ := getZone(existing.ZoneID)
|
|
return p.SendDM(ctx.Sender, fmt.Sprintf(
|
|
"You already have an active expedition in **%s** (Day %d). Finish it or `!expedition abandon` first.",
|
|
zone.Display, existing.CurrentDay))
|
|
}
|
|
|
|
exp, err := getResumableExpedition(ctx.Sender)
|
|
if err != nil {
|
|
return p.SendDM(ctx.Sender, "Couldn't read expedition state: "+err.Error())
|
|
}
|
|
if exp == nil {
|
|
return p.SendDM(ctx.Sender, "No extracted expedition to resume. Use `!expedition start <zone>` to begin a new one.")
|
|
}
|
|
if exp.CompletedAt == nil || time.Since(*exp.CompletedAt) > extractResumeWindow {
|
|
// Expire it so it doesn't keep resurfacing.
|
|
_ = completeExpedition(exp.ID, ExpeditionStatusFailed)
|
|
return p.SendDM(ctx.Sender,
|
|
"That extraction is past its 7-day resume window — the dungeon has reshaped without you. Start a new expedition.")
|
|
}
|
|
|
|
purchase, err := parseSupplyArgs(strings.TrimSpace(args))
|
|
if err != nil {
|
|
return p.SendDM(ctx.Sender, "Couldn't parse supply packs: "+err.Error())
|
|
}
|
|
if err := purchase.Validate(); err != nil {
|
|
return p.SendDM(ctx.Sender, "Invalid pack selection: "+err.Error())
|
|
}
|
|
cost := float64(purchase.Cost())
|
|
if p.euro == nil {
|
|
return p.SendDM(ctx.Sender, "Coin system unavailable — try again later.")
|
|
}
|
|
if balance := p.euro.GetBalance(ctx.Sender); balance < cost {
|
|
return p.SendDM(ctx.Sender, fmt.Sprintf(
|
|
"Not enough coins. Outfitting costs **%d** but you have **%.0f**.",
|
|
int(cost), balance))
|
|
}
|
|
if !p.euro.Debit(ctx.Sender, cost, "expedition resume outfitting: "+string(exp.ZoneID)) {
|
|
return p.SendDM(ctx.Sender, "Couldn't debit outfitting cost (try again).")
|
|
}
|
|
|
|
zone, _ := getZone(exp.ZoneID)
|
|
supplies := makeSupplies(zone.Tier, purchase)
|
|
if err := resumeExpedition(exp.ID, supplies); err != nil {
|
|
p.euro.Credit(ctx.Sender, cost, "expedition resume refund")
|
|
return p.SendDM(ctx.Sender, "Couldn't resume: "+err.Error())
|
|
}
|
|
exp.Status = ExpeditionStatusActive
|
|
exp.Supplies = supplies
|
|
// Spawn a fresh DungeonRun for the resumed region; the prior run was
|
|
// abandoned at extract time. Per-room harvest state in RegionState is
|
|
// preserved as-is so progression isn't reset.
|
|
exp.RunID = ""
|
|
exp.RegionState[regionStateRegionRuns] = map[string]string{}
|
|
_ = persistRegionState(exp)
|
|
if _, err := ensureRegionRun(exp, c.Level); err != nil {
|
|
p.euro.Credit(ctx.Sender, cost, "expedition resume refund (run-spawn failed)")
|
|
return p.SendDM(ctx.Sender, "Couldn't outfit the resumed region: "+err.Error())
|
|
}
|
|
line := flavor.Pick(flavor.ExpeditionResume)
|
|
_ = appendExpeditionLog(exp.ID, exp.CurrentDay, "narrative",
|
|
"expedition resumed", line)
|
|
|
|
var b strings.Builder
|
|
b.WriteString(fmt.Sprintf("🚪 **Expedition resumed — %s, Day %d**\n\n",
|
|
zone.Display, exp.CurrentDay))
|
|
if line != "" {
|
|
b.WriteString(line)
|
|
b.WriteString("\n\n")
|
|
}
|
|
b.WriteString(fmt.Sprintf("**Re-outfitted:** %.0f SU (%d standard, %d deluxe) — %d coins\n",
|
|
supplies.Max, purchase.StandardPacks, purchase.DeluxePacks, purchase.Cost()))
|
|
b.WriteString(fmt.Sprintf("**Threat:** %d / 100 (resumed at extraction value)\n", exp.ThreatLevel))
|
|
if exp.TemporalStack != 0 {
|
|
b.WriteString(fmt.Sprintf("**Zone stack:** %d (resumed)\n", exp.TemporalStack))
|
|
}
|
|
b.WriteString("\nUse `!expedition status` for the daily briefing.")
|
|
return p.SendDM(ctx.Sender, b.String())
|
|
}
|