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

H5 follow-up: short-rest at full HP can still refresh slots

Browse Source 
handleDnDShortRest early-returned when HPCurrent >= HPMax, which dates
from when short rest was HP-only. After H5 (1cd53eb) added the partial
slot refresh, that gate left casters who hadn't been hit unable to
recover slots between fights — the most common slot-attrition scenario.

Loosen the gate: short rest is allowed when HP can heal OR any spell
slot has used > 0. New helper casterHasUsedSlots gates the slot branch.
Martial behavior unchanged (still bails at full HP). Two new tests.
This commit is contained in:
prosolis
2026-05-17 16:06:46 -07:00
parent f2c2d774d4
commit dd25de71f0
3 changed files with 99 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
internal/plugin/dnd_rest.go
View File

@@ -81,24 +81,27 @@ func (p *AdventurePlugin) handleDnDShortRest(ctx MessageContext) error {
return p.SendDM(ctx.Sender,
"You're out of short rest charges. Take a `!rest long` to restore them.")
}
if c.HPCurrent >= c.HPMax {
return p.SendDM(ctx.Sender, "You're already at full HP. Save the charge for when you need it.")
}
conMod := abilityModifier(c.CON)
healDie := 1 + rand.IntN(6) // 1d6
heal := healDie + conMod
if heal < 1 {
heal = 1
}
if c.Level >= 5 {
heal *= 2 // v1.0 §10.1: "x2 at levels 5+"
hpFull := c.HPCurrent >= c.HPMax
hasRefreshableSlots, _ := casterHasUsedSlots(ctx.Sender)
if hpFull && !hasRefreshableSlots {
return p.SendDM(ctx.Sender, "You're at full HP and your slots are full. Save the charge for when you need it.")
}
before := c.HPCurrent
c.HPCurrent += heal
if c.HPCurrent > c.HPMax {
c.HPCurrent = c.HPMax
if !hpFull {
conMod := abilityModifier(c.CON)
healDie := 1 + rand.IntN(6) // 1d6
heal := healDie + conMod
if heal < 1 {
heal = 1
}
if c.Level >= 5 {
heal *= 2 // v1.0 §10.1: "x2 at levels 5+"
}
c.HPCurrent += heal
if c.HPCurrent > c.HPMax {
c.HPCurrent = c.HPMax
}
}
c.ShortRestCharges--
now := time.Now().UTC()
@@ -112,9 +115,16 @@ func (p *AdventurePlugin) handleDnDShortRest(ctx MessageContext) error {
return p.SendDM(ctx.Sender, "Couldn't save rest state: "+err.Error())
}
msg := fmt.Sprintf(
"🛌 **Short rest.** You recover **%d HP** (%d→%d / %d).\n_Charges remaining: %d. You're resting — `!zone` and `!expedition` locked for 1 hour._",
c.HPCurrent-before, before, c.HPCurrent, c.HPMax, c.ShortRestCharges)
var msg string
if c.HPCurrent > before {
msg = fmt.Sprintf(
"🛌 **Short rest.** You recover **%d HP** (%d→%d / %d).\n_Charges remaining: %d. You're resting — `!zone` and `!expedition` locked for 1 hour._",
c.HPCurrent-before, before, c.HPCurrent, c.HPMax, c.ShortRestCharges)
} else {
msg = fmt.Sprintf(
"🛌 **Short rest.** You catch your breath — HP already full (%d/%d).\n_Charges remaining: %d. You're resting — `!zone` and `!expedition` locked for 1 hour._",
c.HPCurrent, c.HPMax, c.ShortRestCharges)
}
if slotLine := dndShortRestSlotLine(slotsRestored); slotLine != "" {
msg += "\n_" + slotLine + "_"
}