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

WIP: in-flight combat/expedition/flavor changes

Browse Source 
Bundle of uncommitted working-tree edits across combat engine, expedition
cycle, flavor pools, and TwinBee/zone narration. Includes new files:
combat_debug.go, dnd_boss_consumables.go, dnd_dex_floor.go, plus
CHANGES_24H.md and REBALANCE_NOTES.md scratch notes.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
prosolis
2026-05-12 21:59:19 -07:00
parent 2b86f3df16
commit 4e412219f3
49 changed files with 1381 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
internal/plugin/combat_bridge.go
View File

@@ -55,11 +55,12 @@ func (p *AdventurePlugin) runDungeonCombat(
playerStats, playerMods := DerivePlayerStats(char, equip, bonuses, chatLvl, char.CurrentStreak, hasGrudge)
// Penalty zone: player is weakened (mirrors +5% death, -15% success from old system)
// Penalty zone Attack/Defense reduction (mirrors +5% death, -15% success
// from old system). The MaxHP penalty is applied below, after
// applyDnDPlayerLayer reseats MaxHP onto the dnd HP scale.
if inPenaltyZone {
playerStats.Attack = int(float64(playerStats.Attack) * 0.85)
playerStats.Defense = int(float64(playerStats.Defense) * 0.85)
playerStats.MaxHP = int(float64(playerStats.MaxHP) * 0.90)
}
// Load consumables from inventory and auto-select
@@ -75,6 +76,12 @@ func (p *AdventurePlugin) runDungeonCombat(
applyDnDPlayerLayer(&playerStats, dndChar)
applyDnDEquipmentLayer(&playerStats, dndChar, equip)
applyDnDHPScaling(&playerStats, dndChar)
if inPenaltyZone {
playerStats.MaxHP = int(float64(playerStats.MaxHP) * 0.90)
if playerStats.StartHP > 0 {
playerStats.StartHP = int(float64(playerStats.StartHP) * 0.90)
}
}
applyClassPassives(&playerStats, &playerMods, dndChar)
applyRacePassives(&playerStats, &playerMods, dndChar)
applySubclassPassives(&playerStats, &playerMods, dndChar)
@@ -84,8 +91,8 @@ func (p *AdventurePlugin) runDungeonCombat(
applyDnDDungeonMonsterLayer(&enemyStats, loc.Tier)
applyPendingCast(userID, dndChar, &playerStats, &playerMods, &enemyStats)
selected := SelectConsumables(consumables, playerStats, enemyStats, 0, loc.Tier)
ApplyConsumableMods(&playerStats, &playerMods, selected)
// Auto-consumable: panic heal only (see dnd_boss_consumables.go).
setupAutoHealFromInventory(consumables, &playerMods)
// Dungeon monsters T3+ can have abilities
var ability *MonsterAbility
@@ -113,18 +120,16 @@ func (p *AdventurePlugin) runDungeonCombat(
}
result := SimulateCombat(player, enemy, dungeonCombatPhases)
result = injectConsumableEvents(result, selected, len(consumables))
dumpCombatEventsIfDebug(fmt.Sprintf("dungeon:%s vs %s", loc.Name, displayName), result)
// Consume used items from inventory
for _, c := range selected {
if err := removeAdvInventoryItem(c.InventoryID); err != nil {
slog.Error("combat: failed to consume item", "id", c.InventoryID, "name", c.Def.Name, "err", err)
}
}
// Remove the actual heal items consumed during combat. No more
// burning Coal Bombs / Ink Vials on chump fights — those stay put
// until a player-driven use command lands.
consumeFiredHealingItems(userID, countHealEventsFired(result))
p.grantCombatAchievements(userID, result)
persistDnDHPAfterCombat(userID, result.PlayerStartHP, result.PlayerEndHP)
persistDnDHPAfterCombat(userID, result.PlayerEndHP)
if err := persistDnDPostCombatSubclass(dndChar, playerMods.BerserkerRage, result, playerMods); err != nil {
slog.Error("dnd: post-combat subclass persist (dungeon)", "user", userID, "err", err)
}
@@ -393,12 +398,25 @@ func checkDeathSaveEvent(events []CombatEvent) bool {
// injectConsumableEvents prepends use_consumable events so the narrative shows which items were consumed.
// If items were available but skipped (trivial threat), a skip event is injected instead.
//
// Uses PlayerEntryHP / EnemyEntryHP — the actual HP each side entered combat
// with — so the pre-combat HP line reflects wounded carry-over honestly. Was
// using PlayerStartHP (= MaxHP), which made wounded entries display "47/47"
// and made any HP loss in opening look like the player took silent damage.
func injectConsumableEvents(result CombatResult, selected []ConsumableItem, inventorySize int) CombatResult {
entryHP := result.PlayerEntryHP
if entryHP == 0 {
entryHP = result.PlayerStartHP
}
enemyEntryHP := result.EnemyEntryHP
if enemyEntryHP == 0 {
enemyEntryHP = result.EnemyStartHP
}
if len(selected) == 0 {
if inventorySize > 0 {
result.Events = append([]CombatEvent{{
Round: 0, Phase: "pre_combat", Actor: "consumable", Action: "consumable_skip",
PlayerHP: result.PlayerStartHP, EnemyHP: result.EnemyStartHP,
PlayerHP: entryHP, EnemyHP: enemyEntryHP,
}}, result.Events...)
}
return result
@@ -407,7 +425,7 @@ func injectConsumableEvents(result CombatResult, selected []ConsumableItem, inve
for _, c := range selected {
events = append(events, CombatEvent{
Round: 0, Phase: "pre_combat", Actor: "consumable", Action: "use_consumable",
PlayerHP: result.PlayerStartHP, EnemyHP: result.EnemyStartHP,
PlayerHP: entryHP, EnemyHP: enemyEntryHP,
Desc: c.Def.Name,
})
}