drwily/gogobee
1
0
Fork 0
mirror of https://github.com/prosolis/gogobee.git synced 2026-07-16 00:52:40 +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

27
internal/plugin/adventure_scheduler.go
View File

@@ -98,6 +98,15 @@ func (p *AdventurePlugin) sendMorningDMs() {
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.
@@ -402,14 +411,22 @@ func (p *AdventurePlugin) midnightReset() error {
continue
}
// Active expedition counts as activity. The expedition system tracks
// its own action flow (zone/harvest/combat/transit/extract) and never
// touches the legacy CombatActionsUsed/HarvestActionsUsed counters, so
// HasActedToday() reports false for expeditioners. Treat them like the
// acted-today branch below: advance the streak and bail out.
// An active expedition — or a turn-based fight locked open across
// midnight — counts as activity. Both track their own action flow
// (zone/harvest/combat/transit/extract) and never touch the legacy
// CombatActionsUsed/HarvestActionsUsed counters, so HasActedToday()
// reports false. Treat them like the acted-today branch below:
// advance the streak and bail out (no idle-shame, no streak decay).
busy := false
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 {
busy = true
}
if !busy && hasActiveCombatSession(char.UserID) {
busy = true
}
if busy {
if char.LastActionDate == yesterday || char.LastActionDate == today {
char.CurrentStreak++
} else {