diff options
Diffstat (limited to 'internal/game/cmd_attack.go')
| -rw-r--r-- | internal/game/cmd_attack.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/internal/game/cmd_attack.go b/internal/game/cmd_attack.go index 27307fe..abaefbb 100644 --- a/internal/game/cmd_attack.go +++ b/internal/game/cmd_attack.go @@ -179,10 +179,8 @@ func (g *Game) startCombat(sess *net.Session, p *player.Player, mob *world.MobIn } } if isTask { - p.ActionState = &ActionState{Type: ActionWorking, TargetName: mob.Name} g.broadcastAction(sess, "\n%s begins working on %s.", p.Name, mobDisplayName(mob, true)) } else { - p.ActionState = &ActionState{Type: ActionCombating, TargetName: mob.Name} g.broadcastAction(sess, "\n%s attacks %s!", p.Name, mobDisplayName(mob, true)) } @@ -265,7 +263,6 @@ func (g *Game) startCombat(sess *net.Session, p *player.Player, mob *world.MobIn func (g *Game) playerAttack(sess *net.Session, p *player.Player, mob *world.MobInstance) { if g.processConsumeQueue(p, sess) { - p.ActionState = &ActionState{Type: ActionEating, TargetName: "food"} return } @@ -332,7 +329,6 @@ func (g *Game) calculatePlayerAttackRoll(p *player.Player, mob *world.MobInstanc func (g *Game) playerAttackUnarmed(sess *net.Session, p *player.Player, mob *world.MobInstance) { if g.processConsumeQueue(p, sess) { - p.ActionState = &ActionState{Type: ActionEating, TargetName: "food"} return } @@ -548,13 +544,11 @@ func (g *Game) applyMobHit(sess *net.Session, p *player.Player, mob *world.MobIn if ss, hasSS := g.safespot.Get(p.Name); hasSS && ss.HideCountdown > 0 { g.safespot.Delete(p.Name) - p.ActionState = &ActionState{Type: ActionCombating, TargetName: mob.Name} sess.WriteLine(g.colorize(sess, "error", "You're hit while repositioning! You failed to hide.")) } if p.MoveTicks > 0 { p.ClearMoveState() - p.ActionState = &ActionState{Type: ActionCombating, TargetName: mob.Name} sess.WriteLine("Can't escape!") } } @@ -569,7 +563,6 @@ func (g *Game) applyMobMiss(sess *net.Session, mob *world.MobInstance) { func (g *Game) endCombat(sess *net.Session, p *player.Player, mob *world.MobInstance) { combat.LeaveCombat(p.Name) - p.ActionState = nil if p.HP <= 0 { g.killPlayer(sess, p, mob) @@ -668,7 +661,6 @@ func (g *Game) endCombat(sess *net.Session, p *player.Player, mob *world.MobInst // retribution. func (g *Game) killPlayer(sess *net.Session, p *player.Player, mob *world.MobInstance) { combat.LeaveCombat(p.Name) - p.ActionState = nil if p.HasActiveTech("retribution") { retDef := GetTechDef("retribution") |