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: guard daily-cron paths against mid-fight combat sessions

Browse Source 
A turn-based elite/boss combat session locks the run for up to 1h and
can straddle any scheduled tick. Add hasActiveCombatSession() and consult
it from the morning DM, midnight idle reaper, expedition briefing/recap,
and mid-day random event paths so none of them fire DMs or mutate run
state into a live fight.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
prosolis
2026-05-14 08:01:10 -07:00
parent 146924818d
commit c84682abf7
5 changed files with 92 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/plugin/dnd_expedition_cycle.go
View File

@@ -81,6 +81,16 @@ func (p *AdventurePlugin) fireExpeditionBriefings(now time.Time) {
return
}
for _, e := range exps {
// Don't roll the expedition day forward into a live turn-based fight:
// an active combat session locks the run, and the briefing burns
// supply / advances the day / processes overnight camp. last_briefing_at
// stays stale, so the rollover simply lands on the next 06:00 tick —
// the expedition holds on its current day for one extra real day, which
// is mild and player-favorable versus mutating a locked run.
if hasActiveCombatSession(id.UserID(e.UserID)) {
slog.Info("expedition: briefing deferred — player in combat session", "expedition", e.ID, "user", e.UserID)
continue
}
if err := p.deliverBriefing(e, now); err != nil {
slog.Error("expedition: briefing", "expedition", e.ID, "err", err)
}
@@ -98,6 +108,13 @@ func (p *AdventurePlugin) fireExpeditionRecaps(now time.Time) {
return
}
for _, e := range exps {
// Same guard as briefings: the recap runs the night wandering check,
// which can bump threat. Don't mutate a run locked by a live fight —
// last_recap_at stays stale and the recap lands on the next tick.
if hasActiveCombatSession(id.UserID(e.UserID)) {
slog.Info("expedition: recap deferred — player in combat session", "expedition", e.ID, "user", e.UserID)
continue
}
if err := p.deliverRecap(e, now); err != nil {
slog.Error("expedition: recap", "expedition", e.ID, "err", err)
}