Neutral target

pkg/engine/engine.go

@@ -239,7 +239,7 @@ type Target interface {
 	Neutrals() []key.TargetID
 
 	// TODO: target type, (Light, Dark, Neutral)
-	AddNeutralTarget() key.TargetID
+	AddNeutralTarget(key key.NeutralTarget) key.TargetID
 
 	RemoveNeutralTarget(id key.TargetID)
 

pkg/engine/info/interface.go

@@ -35,3 +35,7 @@ type ActionState interface {
 type EnemyInstance interface {
 	Action(target key.TargetID, state ActionState)
 }
+
+type NeutralTargetInstance interface {
+	Attack(target key.TargetID, state ActionState)
+}

pkg/engine/info/neutral-target.go

@@ -0,0 +1,11 @@
+package info
+
+import (
+	"github.com/simimpact/srsim/pkg/key"
+	"github.com/simimpact/srsim/pkg/model"
+)
+
+type NeutralTarget struct {
+	Key     key.NeutralTarget `json:"key"`
+	Element model.DamageType  `json:"element"`
+}

pkg/engine/target/neutral-target/add.go

@@ -0,0 +1,25 @@
+package neutraltarget
+
+import (
+	"fmt"
+
+	"github.com/simimpact/srsim/pkg/engine/info"
+	"github.com/simimpact/srsim/pkg/key"
+)
+
+// TODO: Add some way for neutrals to refer back to their owners/summoners to use their stats?
+func (mgr *Manager) AddNeutral(id key.TargetID, key key.NeutralTarget) error {
+	config, ok := neutralCatalog[key]
+	if !ok {
+		return fmt.Errorf("Invalid neutral target %v", key)
+	}
+
+	info := info.NeutralTarget{
+		Key:     key,
+		Element: config.Element,
+	}
+
+	mgr.info[id] = info
+	mgr.instances[id] = config.Create(mgr.engine, id, info)
+	return nil
+}

pkg/engine/target/neutral-target/config.go

@@ -0,0 +1,19 @@
+package neutraltarget
+
+import (
+	"github.com/simimpact/srsim/pkg/engine"
+	"github.com/simimpact/srsim/pkg/engine/info"
+	"github.com/simimpact/srsim/pkg/key"
+	"github.com/simimpact/srsim/pkg/model"
+)
+
+type Config struct {
+	Create  func(engine engine.Engine, id key.TargetID, info info.NeutralTarget) info.NeutralTargetInstance
+	Attack  Attack
+	Speed   float64
+	Element model.DamageType
+}
+
+type Attack struct {
+	TargetType model.TargetType
+}

pkg/engine/target/neutral-target/manager.go

@@ -0,0 +1,57 @@
+package neutraltarget
+
+import (
+	"fmt"
+
+	"github.com/simimpact/srsim/pkg/engine"
+	"github.com/simimpact/srsim/pkg/engine/attribute"
+	"github.com/simimpact/srsim/pkg/engine/info"
+	"github.com/simimpact/srsim/pkg/key"
+	"github.com/simimpact/srsim/pkg/logic"
+)
+
+type Manager struct {
+	engine    engine.Engine
+	attr      attribute.Manager
+	eval      logic.Eval
+	instances map[key.TargetID]info.NeutralTargetInstance
+	info      map[key.TargetID]info.NeutralTarget
+}
+
+func New(engine engine.Engine, attr attribute.Manager, eval logic.Eval) *Manager {
+	return &Manager{
+		engine:    engine,
+		attr:      attr,
+		eval:      eval,
+		instances: make(map[key.TargetID]info.NeutralTargetInstance, 4),
+		info:      make(map[key.TargetID]info.NeutralTarget, 4),
+	}
+}
+
+func (mgr *Manager) Get(id key.TargetID) (info.NeutralTargetInstance, error) {
+	if instance, ok := mgr.instances[id]; ok {
+		return instance, nil
+	}
+
+	return nil, fmt.Errorf("Target id was not a neutral target: %v", id)
+}
+
+func (mgr *Manager) Info(id key.TargetID) (info.NeutralTarget, error) {
+	if info, ok := mgr.info[id]; ok {
+		return info, nil
+	}
+
+	return info.NeutralTarget{}, fmt.Errorf("Target id was not a neutral target: %v", id)
+}
+
+func (mgr *Manager) Neutrals() map[key.TargetID]info.NeutralTarget {
+	return mgr.info
+}
+
+func (mgr *Manager) AttackInfo(id key.TargetID) (Attack, error) {
+	if target, ok := mgr.info[id]; ok {
+		return neutralCatalog[target.Key].Attack, nil
+	}
+
+	return Attack{}, fmt.Errorf("Id was not a neutral %v", id)
+}

pkg/engine/target/neutral-target/register.go

@@ -0,0 +1,27 @@
+package neutraltarget
+
+import (
+	"sync"
+
+	"github.com/simimpact/srsim/pkg/key"
+)
+
+var (
+	mu             sync.Mutex
+	neutralCatalog = make(map[key.NeutralTarget]Config)
+)
+
+func Register(key key.NeutralTarget, neutral Config) {
+	mu.Lock()
+	defer mu.Unlock()
+
+	if _, dup := neutralCatalog[key]; dup {
+		panic("duplicate registration attempt: " + key)
+	}
+
+	if neutral.Create == nil {
+		panic("Neutral create function must be defined: " + key)
+	}
+
+	neutralCatalog[key] = neutral
+}

pkg/key/neutral-target.go

@@ -0,0 +1,8 @@
+package key
+
+type NeutralTarget string
+
+const (
+	LightningLord NeutralTarget = "lightninglord"
+	Numby         NeutralTarget = "Numby"
+)