Start displaying characters on maps

internal/assetstore/ani.go

@@ -1,6 +1,9 @@
 package assetstore
 
 import (
+	"fmt"
+
+	"code.ur.gs/lupine/ordoor/internal/data"
 	"code.ur.gs/lupine/ordoor/internal/idx"
 )
 
@@ -76,3 +79,50 @@ func (a *AssetStore) Animation(groupIdx, recIdx int) (*Animation, error) {
 
 	return &Animation{Frames: sprites}, nil
 }
+
+func (a *AssetStore) CharacterAnimation(ctype data.CharacterType, action data.AnimAction) (*Animation, error) {
+	ha, err := a.HasAction()
+	if err != nil {
+		return nil, err
+	}
+
+	if !ha.Check(ctype, action) {
+		return nil, fmt.Errorf("character %s: animation %s: not available", ctype, action)
+	}
+
+	// FIXME: we still need to be able to go from CTYPE to GROUP. In particular,
+	// squad leaders seem to be a modification on top of a previous group, which
+	// is a bit awkward. For now, hardcode it. How are captain modifiers stored?
+	group, ok := map[data.CharacterType]int{
+		data.CharacterTypeTactical:        1, // Has captain
+		data.CharacterTypeAssault:         3, // Has captain
+		data.CharacterTypeDevastator:      5,
+		data.CharacterTypeTerminator:      6, // Has captain
+		data.CharacterTypeApothecary:      8,
+		data.CharacterTypeTechmarine:      9,
+		data.CharacterTypeChaplain:        10,
+		data.CharacterTypeLibrarian:       11,
+		data.CharacterTypeCaptain:         12,
+		data.CharacterTypeChaosMarine:     13,
+		data.CharacterTypeChaosLord:       14,
+		data.CharacterTypeChaosChaplain:   15,
+		data.CharacterTypeChaosSorcerer:   16,
+		data.CharacterTypeChaosTerminator: 17,
+		data.CharacterTypeKhorneBerserker: 18,
+		data.CharacterTypeBloodThirster:   19, // This is a rotating thing?
+		data.CharacterTypeBloodLetter:     20,
+		data.CharacterTypeFleshHound:      21,
+		data.CharacterTypeLordOfChange:    22, // Another rotating thing?
+		data.CharacterTypeFlamer:          23,
+		data.CharacterTypePinkHorror:      24,
+		data.CharacterTypeBlueHorror:      25,
+		data.CharacterTypeChaosCultist:    26,
+	}[ctype]
+	if !ok {
+		return nil, fmt.Errorf("Unknown character type: %s", ctype)
+	}
+
+	rec := ha.Index(ctype, action)
+
+	return a.Animation(group, rec)
+}

internal/assetstore/assetstore.go

@@ -45,6 +45,7 @@ type AssetStore struct {
 	cursors   map[CursorName]*Cursor
 	fonts     map[string]*Font
 	generic   *data.Generic
+	hasAction *data.HasAction
 	idx       *idx.Idx
 	images    map[string]*ebiten.Image
 	maps      map[string]*Map
@@ -111,6 +112,8 @@ func (a *AssetStore) Refresh() error {
 	a.cursors = make(map[CursorName]*Cursor)
 	a.entries = newEntryMap
 	a.fonts = make(map[string]*Font)
+	a.generic = nil
+	a.hasAction = nil
 	a.idx = nil
 	a.images = make(map[string]*ebiten.Image)
 	a.maps = make(map[string]*Map)

internal/assetstore/data.go

@@ -66,6 +66,26 @@ func (a *AssetStore) DefaultOptions() (*config.Options, error) {
 	return cfg, nil
 }
 
+func (a *AssetStore) HasAction() (*data.HasAction, error) {
+	if a.hasAction != nil {
+		return a.hasAction, nil
+	}
+
+	filename, err := a.lookup("HasAction", "dat", "Data")
+	if err != nil {
+		return nil, err
+	}
+
+	hasAction, err := data.LoadHasAction(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	a.hasAction = hasAction
+
+	return hasAction, nil
+}
+
 func intToBool(i int) bool {
 	return i > 0
 }

internal/assetstore/map.go

@@ -5,6 +5,7 @@ import (
 	"image"
 	"log"
 
+	"code.ur.gs/lupine/ordoor/internal/data"
 	"code.ur.gs/lupine/ordoor/internal/maps"
 )
 
@@ -102,19 +103,15 @@ func (m *Map) SpritesForCell(x, y, z int) ([]*Sprite, error) {
 		sprites = append(sprites, sprite)
 	}
 
-	// FIXME: this just marks character positions with sprite 19 for now.
-	specialsObj, err := m.assets.Object("specials")
-	if err != nil {
-		return nil, err
-	}
-	chrSpr, err := specialsObj.Sprite(19)
-	if err != nil {
-		return nil, err
-	}
-
 	for _, chr := range m.raw.Characters {
 		if chr.XPos == x && chr.YPos == y && z == 1 { // FIXME: sort out ZPos
-			sprites = append(sprites, chrSpr)
+			// Look up the correct animation, get the frame, boom
+			anim, err := m.assets.CharacterAnimation(chr.Type, data.AnimActionNone)
+			if err != nil {
+				return nil, err
+			}
+
+			sprites = append(sprites, anim.Frames[0])
 		}
 	}