diff options
Diffstat (limited to 'internal/game/cmd_trigger.go')
| -rw-r--r-- | internal/game/cmd_trigger.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/internal/game/cmd_trigger.go b/internal/game/cmd_trigger.go index 0acbeff..34e438a 100644 --- a/internal/game/cmd_trigger.go +++ b/internal/game/cmd_trigger.go @@ -4,7 +4,6 @@ import ( "fmt" "strings" - "thehouseoficarus/internal/combat" "thehouseoficarus/internal/net" "thehouseoficarus/internal/player" ) @@ -65,7 +64,7 @@ func (g *Game) parseTriggerArgs(input string, sciLevel int) (*ModDef, string) { } func (g *Game) triggerCombatMod(sess *net.Session, p *player.Player, mod *ModDef, targetArg string) { - if cs := combat.GetCombat(p.Name); cs != nil { + if cs := g.Combat.Get(p.Name); cs != nil { p.QueuedTrigger = mod.ID sess.WriteLine(fmt.Sprintf("You queue %s for your next attack.", mod.Name)) return @@ -101,7 +100,7 @@ func (g *Game) triggerCombatMod(sess *net.Session, p *player.Player, mod *ModDef return } - if combat.IsMobInCombat(mob.InstanceID) { + if g.Combat.IsMobInCombat(mob.InstanceID) { sess.WriteLine(fmt.Sprintf("%s is already engaged in combat!", mobDisplayName(mob, false))) return } |