aboutsummaryrefslogtreecommitdiff
path: root/internal/game/sys_combat.go
diff options
context:
space:
mode:
authorhistoria <[not public]>2026-10-06 12:57:23 -0400
committerhistoria <[not public]>2026-10-06 12:57:23 -0400
commit9666676766bf21364f4fc4d0d1d336e72f2a91b4 (patch)
tree0cade34091d7602790dc38cd44053f0b74bbadf2 /internal/game/sys_combat.go
parent4bc1daaf259e0c19c5fe4a12ec8bc7f6e5a735c1 (diff)
downloadthehouseoficarus-9666676766bf21364f4fc4d0d1d336e72f2a91b4.tar.gz
refactor: split casino.go, dedup helpers, remove audit docs
Diffstat (limited to 'internal/game/sys_combat.go')
-rw-r--r--internal/game/sys_combat.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/internal/game/sys_combat.go b/internal/game/sys_combat.go
index af8cc75..4ccce64 100644
--- a/internal/game/sys_combat.go
+++ b/internal/game/sys_combat.go
@@ -145,6 +145,15 @@ func (g *Game) checkAggro(sess *net.Session) {
if g.Combat.IsMobInCombat(aggMob.InstanceID) {
return false
}
+ // The retry outlives the immediate roll: a player can god or enter a
+ // safespot after the first miss, so re-check both gates on every
+ // retry before rolling again.
+ if p.GodMode {
+ return false
+ }
+ if g.isSafespotted(p.Name) && g.safespotBlocksMob(p, aggMob) {
+ return false
+ }
if rollAggroRand() >= aggroChancePerTick {
return true
}