slop refactor

1 files changed, 4 insertions, 5 deletions

diff --git a/internal/game/cmd_move.go b/internal/game/cmd_move.go
index 2939702..63f9bcd 100644
--- a/internal/game/cmd_move.go
+++ b/internal/game/cmd_move.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"thehouseoficarus/internal/combat"
 	"thehouseoficarus/internal/engine"
+	"thehouseoficarus/internal/item"
 	"thehouseoficarus/internal/net"
-	"thehouseoficarus/internal/object"
 	"thehouseoficarus/internal/player"
 )
 
@@ -70,7 +69,7 @@ func (g *Game) doMove(sess *net.Session, dir string, multiplier float64) {
 	p.MovePendingFlags = exitDef.SetFlags
 	p.MovePendingPlayerFlags = exitDef.SetPlayerFlags
 
-	inCombat := combat.GetCombat(p.Name) != nil
+	inCombat := g.Combat.Get(p.Name) != nil
 
 	if !inCombat && p.Action != nil {
 		g.cancelAction(p)
@@ -106,7 +105,7 @@ var gracefulItems = map[string]bool{
 }
 
 func (g *Game) moveTicks(p *player.Player, multiplier float64) int {
-	if id, ok := p.Equipment[object.SlotBack]; ok && id == "cape_of_agility" {
+	if id, ok := p.Equipment[item.SlotBack]; ok && id == "cape_of_agility" {
 		return 0
 	}
 
@@ -134,7 +133,7 @@ func (g *Game) completeMove(sess *net.Session, p *player.Player) {
 
 	p.ClearMoveState()
 
-	if combat.GetCombat(p.Name) != nil {
+	if g.Combat.Get(p.Name) != nil {
 		g.stopCombat(p.Name)
 	}