drwily/gogobee
1
0
Fork 0
mirror of https://github.com/prosolis/gogobee.git synced 2026-07-15 08:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combat: auto-play timed-out turn-based sessions to a real win/loss

Browse Source 
A combat session abandoned past its 1h TTL is now resumed from persisted
mid-state and auto-played through the shared resolver to a real win or
loss, rather than flatly marked as a retreat. The bulk-UPDATE sweep is
replaced by listExpiredCombatSessions plus a reaper that locks the user,
auto-plays the fight, runs the normal close-out, and DMs the outcome.
markCombatSessionExpired remains the terminal fallback for sessions that
can't be reconstructed. Wired into eventTicker.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
prosolis
2026-05-14 06:30:52 -07:00
parent 886eb5a75b
commit a0961fee8a
4 changed files with 161 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
internal/plugin/combat_session.go
View File

@@ -249,23 +249,42 @@ func saveCombatSession(s *CombatSession) error {
return nil
}
// sweepExpiredCombatSessions is the timeout reaper. It marks every active
// session past its expires_at as 'expired' (a terminal status alongside
// won/lost/fled) and parks it in the 'over' phase. Auto-playing an abandoned
// fight to a real win/loss needs Combatant reconstruction, which lands with
// the command-wiring PR; until then 'expired' is the safe terminal outcome —
// no fatal-blow side effects, treated like a retreat. Returns the sweep count.
func sweepExpiredCombatSessions() (int, error) {
res, err := db.Get().Exec(`
// listExpiredCombatSessions returns every active session past its expires_at.
// The timeout reaper (reapExpiredCombatSessions) auto-plays each of these to a
// real win/loss from persisted mid-state — per the 2026-05-13 decision, an
// abandoned fight is finished by the engine, not flatly marked as a retreat.
func listExpiredCombatSessions() ([]*CombatSession, error) {
rows, err := db.Get().Query(`SELECT `+combatSessionCols+`
FROM combat_session
WHERE status = 'active'
AND expires_at <= CURRENT_TIMESTAMP
ORDER BY started_at ASC`)
if err != nil {
return nil, err
}
defer rows.Close()
var out []*CombatSession
for rows.Next() {
s, err := scanCombatSession(rows)
if err != nil {
return nil, err
}
out = append(out, s)
}
return out, rows.Err()
}
// markCombatSessionExpired is the fallback terminal outcome for a stale session
// the reaper cannot auto-play (zone run gone, enemy missing from the bestiary,
// or a runaway fight that won't converge). It parks the row in 'expired'/'over'
// with no fatal-blow side effects — treated like a retreat.
func markCombatSessionExpired(sessionID string) error {
_, err := db.Get().Exec(`
UPDATE combat_session
SET status = 'expired',
phase = 'over',
last_action_at = CURRENT_TIMESTAMP
WHERE status = 'active'
AND expires_at <= CURRENT_TIMESTAMP`)
if err != nil {
return 0, err
}
n, _ := res.RowsAffected()
return int(n), nil
WHERE session_id = ? AND status = 'active'`, sessionID)
return err
}