diff options
Diffstat (limited to 'internal/game/sys_science.go')
| -rw-r--r-- | internal/game/sys_science.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/internal/game/sys_science.go b/internal/game/sys_science.go index 517e051..0ee446b 100644 --- a/internal/game/sys_science.go +++ b/internal/game/sys_science.go @@ -8,9 +8,9 @@ import ( "gopkg.in/yaml.v3" - "thehouseoficarus/internal/action" + "thehouseoficarus/internal/behavior" + "thehouseoficarus/internal/item" "thehouseoficarus/internal/net" - "thehouseoficarus/internal/object" "thehouseoficarus/internal/player" ) @@ -44,7 +44,7 @@ func (g *Game) LoadMods() error { dir := filepath.Join(g.DataDir, "modules") AllMods = nil modByID = make(map[string]*ModDef) - action.WalkYAMLDir(dir, func(path, id string, data []byte) error { + behavior.WalkYAMLDir(dir, func(path, id string, data []byte) error { var m ModDef if err := yaml.Unmarshal(data, &m); err != nil { return nil @@ -173,7 +173,7 @@ var chipMap = map[string]chipEntry{ } func (g *Game) hasDeckEquipped(p *player.Player) bool { - itemID, ok := p.Equipment[object.SlotMainHand] + itemID, ok := p.Equipment[item.SlotMainHand] if !ok { return false } @@ -181,11 +181,11 @@ func (g *Game) hasDeckEquipped(p *player.Player) bool { if err != nil { return false } - return def.WeaponType == object.WeaponScience + return def.WeaponType == item.WeaponScience } func (g *Game) providesJunk(p *player.Player) string { - itemID, ok := p.Equipment[object.SlotMainHand] + itemID, ok := p.Equipment[item.SlotMainHand] if !ok { return "" } @@ -296,5 +296,3 @@ func (g *Game) totalScienceAttack(p *player.Player) int { } return total } - - |