diff options
Diffstat (limited to 'internal/game/cmd_stats.go')
| -rw-r--r-- | internal/game/cmd_stats.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/internal/game/cmd_stats.go b/internal/game/cmd_stats.go index 2466a5f..ef5e2ba 100644 --- a/internal/game/cmd_stats.go +++ b/internal/game/cmd_stats.go @@ -4,8 +4,8 @@ import ( "fmt" "thehouseoficarus/internal/combat" + "thehouseoficarus/internal/item" "thehouseoficarus/internal/net" - "thehouseoficarus/internal/object" "thehouseoficarus/internal/player" ) @@ -19,18 +19,18 @@ func (g *Game) doStats(sess *net.Session) { attackType := "crush" weaponName := "unarmed" - var weaponType object.WeaponType - var weaponDef *object.ItemDef - if itemID, ok := p.Equipment[object.SlotMainHand]; ok { + var weaponType item.WeaponType + var weaponDef *item.ItemDef + if itemID, ok := p.Equipment[item.SlotMainHand]; ok { if def, err := g.ItemStore.Load(itemID); err == nil { weaponDef = def weaponName = def.Name weaponType = def.WeaponType if def.AttackType != "" { attackType = def.AttackType - } else if def.WeaponType == object.WeaponRanged { + } else if def.WeaponType == item.WeaponRanged { attackType = "ranged" - } else if def.WeaponType == object.WeaponScience { + } else if def.WeaponType == item.WeaponScience { attackType = "science" } } @@ -58,7 +58,7 @@ func (g *Game) doStats(sess *net.Session) { ) var attRoll, maxHitVal int - if weaponType == object.WeaponRanged { + if weaponType == item.WeaponRanged { rangedBonus, _ := combat.RangedStyleBonus(string(p.AttackStyle)) attRoll = combat.EffectiveRoll(p.Level(player.Ranged), rangedBonus, totals.RangedAttack) maxHitVal = combat.MaxHit(p.Level(player.Ranged), rangedBonus, totals.RangedStrength) |