fixed

- separated entities spriteset from primarymap, which only contains
  tiles
- fixed star obstacle

.gitignore

@@ -1 +1,2 @@
-openquell
+openquell*
+tmp

Makefile

@@ -1,3 +1,12 @@
+version   = $(shell egrep "version string = " config/static.go | cut -d'"' -f 2)
+BRANCH    = $(shell git branch --show-current)
+COMMIT    = $(shell git rev-parse --short=8 HEAD)
+BUILD     = $(shell date +%Y.%m.%d.%H%M%S) 
+#VERSION  := $(if $(filter $(BRANCH), development),$(version)-$(BRANCH)-$(COMMIT)-$(BUILD),$(version))
+VERSION := $(version)-$(BRANCH)-$(COMMIT)-$(BUILD)
+SHORTVERSION := $(version)-$(BRANCH)-$(COMMIT)
+LDFLAGS := -ldflags "-X 'openquell/config.VERSION=$(VERSION)'"
+
 all: clean build
 	@echo ok
 
@@ -5,8 +14,16 @@ clean:
 	rm -f openquell
 
 build:
-	go build
+	go build -ldflags "-X 'openquell/config.VERSION=$(VERSION)'"
 
+buildwasm:
+	env GOOS=js GOARCH=wasm go build -o openquell.wasm $(LDFLAGS) .
+
+zipwasm:
+	zip -r openquell-$(SHORTVERSION).zip index.html openquell.wasm wasm_exec.js
+
+wasm: buildwasm zipwasm
+	@ls -l openquell-$(SHORTVERSION).zip
 
 test:
-	@echo 1
+	@echo $(VERSION)

TODO.md

@@ -2,31 +2,36 @@
 
 - ignore comments in lvl files
 
-- check  when sphere bounces from  one end to the  other endlessly w/o
-  any solids in between. this is a game lock and equals game over
-
-- Start the game  end timer and add a score FIXME:  put the actual max
-  reachable score  into the  level definition  along with  the minimum
-  steps required to reach it, also add a step counter
-
 - Grid Observer:
   https://github.com/mlange-42/arche/issues/374
 
-- Add some final message when the player reaches the last level, start
-  from scratch or a message to buy me some beer, whatever
-
-- Check player-player collisions!
-
-- Add  player mergers, possibly as  an option, so maybe  we could have
-  different primary  and secondary  players: one  pair can  merge, the
-  other not. Like S + s and M + m or something.
-
 - Add shaders for animation (player destruction etc)
 
-- Add player HUD + Stats (as hud_system!)
+- Start New game starts with last played level, better add a Resume
+  Game menu item for this and use Start New always for level 1.
 
+- for finding caller:
+	pc := make([]uintptr, 10)
+	n := runtime.Callers(0, pc)
+	pc = pc[:n]
+	fs := runtime.CallersFrames(pc)
+	source, _ := fs.Next()
+	source, _ = fs.Next()
+	source, _ = fs.Next()
 
-## Collider Rework
+	slog.Debug("get observer", "minmoves", observer.LevelScore,
+		"file", source.File, "line", source.Line)
+
+- Turn menu button in hud_system (events in level_scene!) into ebitenui button
+
+- Obstacle don't stop at collectibles
+
+-  Player can  collect collectible  hidden under  obstacle (should  be
+  fixed when above is fixed)
+  
+- Remove Sprite from Tile{}, not used anymore
+
+## Collider Rework [abandoned: see branch collider-system, fails]
 
 - do not use the map anymore for collision detection
 - central collision_system

assets/levels/00-deadly-obstacles.lvl

@@ -1,4 +1,5 @@
-Description: test obstacles
+Description: open the door
+MinMoves: 2
 Background: background-lila
                     
                     

assets/levels/01-friendly-obstacles.lvl

@@ -1,4 +1,5 @@
 Description: test obstacles
+MinMoves: 14
 Background: background-lila
                     
                     

assets/levels/02-start.lvl

@@ -1,4 +1,5 @@
-Description: find the fruit
+Description: collect all yellow dots
+MinMoves: 7
 Background: background-lila
                     
                     

assets/levels/03-own.lvl

@@ -1,17 +1,18 @@
-Description: win
+Description: some enemies can be moved
+MinMoves: 5
 Background: background-lila
                     
                     
                     
                     
      ########       
-     #v o   #       
-     #  S<# #       
+     #  o <o#       
+     #v S # #       
      # #### #       
                     
                     
      # #### #       
      #      #       
-     #>    ^#       
+     #     ^#       
      ########       
                     

assets/levels/04-mayhem.lvl

@@ -1,4 +1,5 @@
-Description: use multiple players
+Description: the more players the better
+MinMoves: 4
 Background: background-lila
                     
                     

assets/levels/05-space.lvl

@@ -1,17 +1,18 @@
-Description: space
+Description: don't fall off the world
+MinMoves: 3
 Background: background-lila
                     
                     
                     
                     
+        W           
+                    
+                    
+        S      # o  
+                    
+                    
+                    
+                    
+        o           
                 #   
                     
-                    
-        S           
-                    
-                    
-                    
-        #           
-                    
-                    
-                    

assets/loader-levels.go

@@ -1,22 +1,17 @@
 package assets
 
 import (
-	"bufio"
 	_ "image/png"
-	"io/fs"
 	"log"
-	"log/slog"
 	"openquell/config"
 	"openquell/util"
-	"os"
-	"path/filepath"
-	"sort"
 	"strings"
 
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/solarlune/ldtkgo"
 )
 
-var Levels = LoadLevels("levels")
+var Project = LoadLDTK("levels")
 var Tiles = InitTiles()
 
 // Tile:  contains  image, identifier  (as  used  in level  data)  and
@@ -38,6 +33,8 @@ type Tile struct {
 	TileNames   []string        // same thing, only the names
 	Obstacle    bool            // is an obstacle/enemy
 	Direction   int             // obstacle business end shows into this direction
+	Shader      *ebiten.Shader
+	Alpha       *ebiten.Image
 }
 
 func (tile *Tile) Clone() *Tile {
@@ -58,6 +55,8 @@ func (tile *Tile) Clone() *Tile {
 		TileNames:   tile.TileNames,
 		Obstacle:    tile.Obstacle,
 		Direction:   tile.Direction,
+		Alpha:       tile.Alpha,
+		Shader:      tile.Shader,
 	}
 
 	return newtile
@@ -163,146 +162,105 @@ func NewTileTranswall(class []string) *Tile {
 	}
 }
 
-func NewTileHiddenDoor(class []string) *Tile {
-	sprites := []*ebiten.Image{}
-	names := []string{}
-
-	for _, sprite := range class {
-		sprites = append(sprites, Assets[sprite])
-		names = append(names, sprite)
-	}
-
+func NewTileHiddenDoor(class, alpha string) *Tile {
 	return &Tile{
 		Id:          'W',
 		Class:       "hiddendoor",
 		Solid:       false,
 		Renderable:  true,
 		Destroyable: true,
-		Tiles:       sprites,
-		Sprite:      sprites[0], // initially use the first
-		TileNames:   names,
+		Sprite:      Assets[class],
+		Alpha:       Assets[alpha],
+		Shader:      Shaders["destruct"],
 	}
 }
 
 // used to map level data bytes to actual tiles
-type TileRegistry map[byte]*Tile
-
-// holds a raw level spec:
-//
-// Name:        the name of the level file w/o the .lvl extension
-// Background:  an image name used as game background for this level
-// Description: text to display on top
-// Data:        a level spec consisting of chars of the above mapping and spaces, e.g.:
-// ####
-// #  #
-// ####
-//
-// Each level data must be 20 chars wide (= 640 px width) and 15 chars
-// high (=480 px height).
-type RawLevel struct {
-	Name        string
-	Description string
-	Background  *ebiten.Image
-	Data        []byte
-}
+type TileRegistry map[string]*Tile
 
 func InitTiles() TileRegistry {
 	return TileRegistry{
-		' ': {Id: ' ', Class: "floor", Renderable: false},
-		//'#': NewTileBlock("block-grey32"),
-		'#': NewTileBlock("block-greycolored"),
-		'B': NewTileBlock("block-orange-32"),
-		'S': NewTilePlayer(Primary),
-		's': NewTilePlayer(Secondary),
-		'o': NewTileCollectible("collectible-orange"),
-		'+': NewTileObstacle("obstacle-star", config.All),
-		'^': NewTileObstacle("obstacle-north", config.North),
-		'v': NewTileObstacle("obstacle-south", config.South),
-		'<': NewTileObstacle("obstacle-west", config.West),
-		'>': NewTileObstacle("obstacle-east", config.East),
-		'*': NewTileParticle([]string{
-			//"particle-ring-1",
+		"floor":           {Id: ' ', Class: "floor", Renderable: false},
+		"default":         NewTileBlock("block-greycolored"),
+		"solidorange":     NewTileBlock("block-orange-32"),
+		"PlayerPrimary":   NewTilePlayer(Primary),
+		"PlayerSecondary": NewTilePlayer(Secondary),
+		"Collectible":     NewTileCollectible("collectible-orange"),
+		"ObstacleStar":    NewTileObstacle("obstacle-star", config.All),
+		"ObstacleNorth":   NewTileObstacle("obstacle-north", config.North),
+		"ObstacleSouth":   NewTileObstacle("obstacle-south", config.South),
+		"ObstacleWest":    NewTileObstacle("obstacle-west", config.West),
+		"ObstacleEast":    NewTileObstacle("obstacle-east", config.East),
+		"Particle": NewTileParticle([]string{
+			"particle-ring-1",
 			"particle-ring-2",
 			"particle-ring-3",
 			"particle-ring-4",
 			"particle-ring-5",
 			"particle-ring-6",
 		}),
-		't': NewTileTranswall([]string{"transwall", "block-orange-32"}),
-		'W': NewTileHiddenDoor([]string{"block-greycolored", "block-greycolored-damaged"}),
+		"Transient":    NewTileTranswall([]string{"transwall", "block-orange-32"}),
+		"HiddenDoor":   NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor2":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor3":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor4":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor5":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor6":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor7":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor8":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor9":  NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor10": NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor11": NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor12": NewTileHiddenDoor("block-greycolored", "damage"),
+		"HiddenDoor13": NewTileHiddenDoor("block-greycolored", "damage"),
 	}
 }
 
-// load levels at compile time into ram, creates a slice of raw levels
-func LoadLevels(dir string) []RawLevel {
-	levels := []RawLevel{}
-
-	// we use embed.FS to iterate over all files in ./levels/
-	entries, err := assetfs.ReadDir(dir)
+// load LDTK project at compile time into ram
+func LoadLDTK(dir string) *ldtkgo.Project {
+	fd, err := assetfs.Open("levels/openquell.ldtk")
 	if err != nil {
-		log.Fatalf("failed to read level dir %s: %s", dir, err)
-	}
-
-	sort.Slice(entries, func(i, j int) bool {
-		return entries[i].Name() < entries[j].Name()
-	})
-
-	for _, levelfile := range entries {
-		if levelfile.Type().IsRegular() && strings.Contains(levelfile.Name(), ".lvl") {
-			path := filepath.Join("assets", dir)
-			level := ParseRawLevel(path, levelfile)
-
-			levels = append(levels, level)
-
-			slog.Debug("loaded level", "path", path, "file", levelfile)
-		}
-	}
-
-	return levels
-}
-
-func ParseRawLevel(dir string, levelfile fs.DirEntry) RawLevel {
-	fd, err := os.Open(filepath.Join(dir, levelfile.Name()))
-	if err != nil {
-		log.Fatalf("failed to read level file %s: %s", levelfile.Name(), err)
+		log.Fatalf("failed to open LDTK file levels/openquell.ldtk: %s", err)
 	}
 	defer fd.Close()
 
-	name := strings.TrimSuffix(levelfile.Name(), ".lvl")
-	des := ""
-	background := &ebiten.Image{}
-	data := []byte{}
-
-	scanner := bufio.NewScanner(fd)
-	for scanner.Scan() {
-		// ignore any whitespace
-		line := scanner.Text()
-
-		// ignore empty lines
-		if len(line) == 0 {
-			continue
+	fileinfo, err := fd.Stat()
+	if err != nil {
+		log.Fatalf("failed to stat() LDTK file levels/openquell.ldtk: %s", err)
 	}
 
-		switch {
-		case strings.Contains(line, "Background:"):
-			haveit := strings.Split(line, ": ")
-			if util.Exists(Assets, haveit[1]) {
-				background = Assets[haveit[1]]
+	filesize := fileinfo.Size()
+	buffer := make([]byte, filesize)
+
+	_, err = fd.Read(buffer)
+	if err != nil {
+		log.Fatalf("failed to read bytes from LDTK file levels/openquell.ldtk: %s", err)
 	}
-		case strings.Contains(line, "Description:"):
-			haveit := strings.Split(line, ": ")
-			des = haveit[1]
-		default:
-			// all other  non-empty and  non-equalsign lines  are
-			// level definition matrix data, merge thes into data
-			data = append(data, line+"\n"...)
+
+	project, err := ldtkgo.Read(buffer)
+	if err != nil {
+		panic(err)
+	}
+
+	// do some sanity checks
+	properties := []string{"minmoves", "background", "level", "description"}
+	need := len(properties)
+
+	for idx, level := range project.Levels {
+		have := 0
+
+		for _, property := range level.Properties {
+			if util.Contains(properties, property.Identifier) {
+				have++
 			}
 		}
 
-	return RawLevel{
-		Name:        name,
-		Data:        data,
-		Background:  background,
-		Description: des,
+		if have != need {
+			log.Fatalf("level definition for level %d (%s) invalid: %d missing properties\n   required: %s",
+				idx, level.Identifier, need-have, strings.Join(properties, ", "),
+			)
 		}
 	}
+
+	return project
+}

assets/loader-shaders.go

@@ -0,0 +1,49 @@
+package assets
+
+import (
+	"bytes"
+	"log"
+	"log/slog"
+	"path/filepath"
+	"strings"
+
+	"github.com/hajimehoshi/ebiten/v2"
+)
+
+type ShaderRegistry map[string]*ebiten.Shader
+
+var Shaders = LoadShaders("shaders")
+
+func LoadShaders(dir string) ShaderRegistry {
+	shaders := ShaderRegistry{}
+
+	entries, err := assetfs.ReadDir(dir)
+	if err != nil {
+		log.Fatalf("failed to read shaders dir %s: %s", dir, err)
+	}
+
+	for _, file := range entries {
+		path := filepath.Join(dir, file.Name())
+		fd, err := assetfs.Open(path)
+		if err != nil {
+			log.Fatalf("failed to open shader file %s: %s", file.Name(), err)
+		}
+		defer fd.Close()
+
+		name := strings.TrimSuffix(file.Name(), ".kg")
+
+		buf := new(bytes.Buffer)
+		buf.ReadFrom(fd)
+
+		shader, err := ebiten.NewShader([]byte(buf.Bytes()))
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		shaders[name] = shader
+
+		slog.Debug("loaded shader asset", "path", path)
+	}
+
+	return shaders
+}

assets/loader-sprites.go

@@ -6,7 +6,6 @@ import (
 	_ "image/png"
 	"log"
 	"log/slog"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -16,7 +15,7 @@ import (
 // Maps image name to image data
 type AssetRegistry map[string]*ebiten.Image
 
-//go:embed levels/*.lvl sprites/*.png fonts/*.ttf
+//go:embed sprites/*.png fonts/*.ttf levels/*.ldtk shaders/*.kg
 var assetfs embed.FS
 
 var Assets = LoadImages("sprites")
@@ -31,8 +30,8 @@ func LoadImages(dir string) AssetRegistry {
 	}
 
 	for _, imagefile := range entries {
-		path := filepath.Join("assets", dir, imagefile.Name())
-		fd, err := os.Open(path)
+		path := filepath.Join(dir, imagefile.Name())
+		fd, err := assetfs.Open(path)
 		if err != nil {
 			log.Fatalf("failed to open image file %s: %s", imagefile.Name(), err)
 		}

assets/shaders/destruct.kg

@@ -0,0 +1,36 @@
+// Copyright 2020 The Ebiten Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build ignore
+
+//kage:unit pixels
+
+package main
+
+var Damaged int
+
+const HP float = 0
+
+func Fragment(_ vec4, texCoord vec2, _ vec4) vec4 {
+	wallpx := imageSrc0At(texCoord) // A pixel from the wall tile
+	mask := imageSrc1At(texCoord)   // A pixel from the damage mask image
+
+	if Damaged == 1 && (wallpx.a != 0.0 && mask.a != 0.0) {
+		alpha := clamp(HP+(1.0-mask.a), 0.0, 1.0)
+		// Create a darker pixel if it's inside a damage mask.
+		return vec4(wallpx.r*alpha, wallpx.g*alpha, wallpx.b*alpha, wallpx.a)
+	}
+
+	return wallpx // Otherwise, leave a pixel color as is
+}

assets/sprites/makemap.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+montage -tile 4x0 -geometry +0+0 block* collectible-orange.png obstacle-* sphere-blue* transwall.png map.png && okular map.png

components/components.go

@@ -8,6 +8,9 @@ import (
 
 type Renderable struct {
 	Image       *ebiten.Image
+	DamageImage *ebiten.Image
+	Damaged     int
+	Shader      *ebiten.Shader
 }
 
 type Particle struct {

components/player.go

@@ -5,6 +5,9 @@ import "github.com/hajimehoshi/ebiten/v2"
 type Player struct {
 	IsPrimary bool
 	Sprites   []*ebiten.Image
+	LoopPos   *Position
+	LoopStart bool
+	LoopCount int
 }
 
 func (player *Player) SwitchSprite() *ebiten.Image {

components/position.go

@@ -90,14 +90,7 @@ func (tile *Position) Intersects(moving *Position, velocity *Velocity) (bool, *P
 
 	is := tile.Rect.Bounds().Intersect(object.Rect.Bounds())
 	if is != image.ZR {
-		/*
-			slog.Debug("Intersect",
-				"velocity", velocity.Data,
-				"player", moving.Rect,
-				"moved player", object.Rect,
-				"collision at", is,
-			)
-		*/
+
 		// collision, snap into neighbouring tile depending on the direction
 		switch velocity.Direction {
 		case West:
@@ -110,6 +103,13 @@ func (tile *Position) Intersects(moving *Position, velocity *Velocity) (bool, *P
 			object.Update(tile.X, tile.Rect.Max.Y)
 		}
 
+		// slog.Debug("Intersect",
+		// 	"velocity", velocity.Data,
+		// 	"player", moving,
+		// 	"moved player", object,
+		// 	"collision at", is,
+		// 	"tilepos", tile,
+		// )
 		return true, object
 	}
 

components/velocity.go

@@ -60,6 +60,8 @@ func (velocity *Velocity) InvertDirection() int {
 	case North:
 		return South
 	case All:
+		return All
+	case Stop:
 		return Stop
 	}
 

config/static.go

@@ -1,6 +1,8 @@
 package config
 
-import "time"
+import (
+	"time"
+)
 
 const (
 	Stop = iota
@@ -11,6 +13,13 @@ const (
 	All
 )
 
-const PLAYERSPEED int = 4
+const PLAYERSPEED int = 5
 const PARTICLE_LOOPWAIT time.Duration = 250 * time.Millisecond
 const LEVEL_END_WAIT time.Duration = 500 * time.Millisecond
+const version string = "1.2.1"
+
+const MenuRectX int = 600
+const MenuRectY int = 0
+const MenuRectCellsize int = 32
+
+var VERSION string // maintained by -x

game/about_scene.go

@@ -4,6 +4,7 @@ import (
 	"image/color"
 	"log/slog"
 	"openquell/assets"
+	"openquell/config"
 	"openquell/gameui"
 
 	"github.com/ebitenui/ebitenui"
@@ -27,7 +28,8 @@ Thomas von Dein <tom@vondein.org>.
 Download it on repo.daemon.de/openquell/.
 
 Copyright (c) 2024 by Thomas von Dein.
-`
+
+Version: `
 
 func NewAboutScene(game *Game) Scene {
 	scene := &AboutScene{Whoami: About, Game: game, Next: About}
@@ -81,7 +83,7 @@ func (scene *AboutScene) SetupUI() {
 	)
 
 	about := widget.NewText(
-		widget.TextOpts.Text(ABOUT, *assets.FontRenderer.FontNormal, blue),
+		widget.TextOpts.Text(ABOUT+config.VERSION, *assets.FontRenderer.FontNormal, blue),
 		widget.TextOpts.Position(widget.TextPositionStart, widget.TextPositionCenter),
 	)
 

game/game.go

@@ -18,7 +18,7 @@ type Game struct {
 	Scenes                              map[SceneName]Scene
 	CurrentScene                        SceneName
 	Observer                            *observers.GameObserver
-	Levels                              []*Level // needed to feed select_scene
+	Levels                              []*Level // fed in PlayScene.GenerateLevels()
 	Config                              *config.Config
 }
 
@@ -35,16 +35,14 @@ func NewGame(width, height, cellsize int, cfg *config.Config, startscene SceneNa
 		Config:       cfg,
 	}
 
-	observers.NewPlayerObserver(&world)
-	observers.NewParticleObserver(&world)
-	observers.NewObstacleObserver(&world)
-	game.Observer = observers.NewGameObserver(&world, cfg.Startlevel, width, height, cellsize)
+	game.Observer = observers.NewGameObserver(
+		&world, cfg.Startlevel, width, height, cellsize)
 
 	game.Scenes[Welcome] = NewWelcomeScene(game)
 	game.Scenes[Menu] = NewMenuScene(game)
 	game.Scenes[About] = NewAboutScene(game)
 	game.Scenes[Popup] = NewPopupScene(game)
-	game.Scenes[Play] = NewLevelScene(game, cfg.Startlevel)
+	game.Scenes[Play] = NewPlayScene(game, cfg.Startlevel)
 	game.Scenes[Select] = NewSelectScene(game)
 
 	game.CurrentScene = startscene
@@ -59,22 +57,18 @@ func (game *Game) GetCurrentScene() Scene {
 }
 
 func (game *Game) Update() error {
-	gameobserver := observers.GetGameObserver(game.World)
-
 	// handle level ends
-	timer := gameobserver.StopTimer
+	timer := game.Observer.StopTimer
 
 	if timer.IsReady() {
 		// a  level is either  lost or won,  we display a  small popup
 		// asking the user how to continue from here
 		timer.Reset()
 
-		slog.Debug("timer ready", "lost", gameobserver.Lost, "retry", gameobserver.Retry)
-		if !gameobserver.Lost {
-			gameobserver.Score++ // FIXME: use level.Score(), see TODO
-		}
+		slog.Debug("timer ready", "lost", game.Observer.Lost, "retry", game.Observer.Retry)
+		game.Observer.AddScore()
 
-		game.Scenes[Nextlevel] = NewNextlevelScene(game, gameobserver.Lost)
+		game.Scenes[Nextlevel] = NewNextlevelScene(game)
 		game.CurrentScene = Nextlevel
 	}
 
@@ -88,18 +82,19 @@ func (game *Game) Update() error {
 	}
 
 	next := scene.GetNext()
+
 	if next != game.CurrentScene {
 		if next == Play && game.CurrentScene == Nextlevel {
 			// switched from nextlevel (lost or won) popup to play (either retry or next level)
-			if !gameobserver.Retry {
-				gameobserver.CurrentLevel++
+			if !game.Observer.Retry {
+				game.Observer.CurrentLevel++
 			}
-			gameobserver.Retry = false
+			game.Observer.Retry = false
 		}
 
 		if next == Play {
 			// fresh setup of actual level every time we enter the play scene
-			game.Scenes[Play].SetLevel(gameobserver.CurrentLevel)
+			game.Scenes[Play].SetLevel(game.Observer.CurrentLevel)
 		}
 
 		// make sure we stay on the selected scene
@@ -108,8 +103,8 @@ func (game *Game) Update() error {
 		// finally switch
 		game.CurrentScene = next
 
-		// FIXME: add some reset function to gameobserver for these kinds of things
-		gameobserver.Lost = false
+		// FIXME: add some reset function to game.Observer for these kinds of things
+		game.Observer.Lost = false
 	}
 
 	timer.Update()

game/level_scene.go

@@ -1,93 +0,0 @@
-package game
-
-import (
-	"fmt"
-	"log/slog"
-	"openquell/assets"
-
-	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
-)
-
-type LevelScene struct {
-	Game         *Game
-	CurrentLevel int
-	Levels       []*Level
-	Next         SceneName
-	Whoami       SceneName
-	UseCache     bool
-}
-
-// Implements the actual playing Scene
-func NewLevelScene(game *Game, startlevel int) Scene {
-	scene := &LevelScene{Whoami: Play, Next: Play, Game: game}
-
-	scene.GenerateLevels(game)
-	scene.SetLevel(startlevel)
-
-	return scene
-}
-
-func (scene *LevelScene) GenerateLevels(game *Game) {
-	for _, level := range assets.Levels {
-		scene.Levels = append(scene.Levels, NewLevel(game, 32, &level))
-	}
-
-	scene.Game.Levels = scene.Levels
-}
-
-func (scene *LevelScene) SetLevel(level int) {
-	scene.CurrentLevel = level
-	scene.Levels[scene.CurrentLevel].SetupGrid(scene.Game)
-}
-
-// Interface methods
-func (scene *LevelScene) SetNext(next SceneName) {
-	scene.Next = next
-}
-
-func (scene *LevelScene) GetNext() SceneName {
-	// FIXME: set to winner or options screen
-	return scene.Next
-}
-
-func (scene *LevelScene) ResetNext() {
-	scene.Next = scene.Whoami
-}
-
-func (scene *LevelScene) Clearscreen() bool {
-	return false
-}
-
-func (scene *LevelScene) Update() error {
-	scene.Levels[scene.CurrentLevel].Update()
-
-	switch {
-	case ebiten.IsKeyPressed(ebiten.KeyEscape):
-		scene.SetNext(Popup)
-	}
-
-	return nil
-}
-
-func (scene *LevelScene) Draw(screen *ebiten.Image) {
-	// FIXME: why not in Update() ?!?!?!
-	if scene.CurrentLevel != scene.Game.Observer.CurrentLevel {
-		slog.Debug("level", "current", scene.CurrentLevel,
-			"next", scene.Game.Observer.CurrentLevel)
-		scene.CurrentLevel = scene.Game.Observer.CurrentLevel
-		scene.Levels[scene.CurrentLevel].SetupGrid(scene.Game)
-	}
-
-	screen.Clear()
-	scene.Levels[scene.CurrentLevel].Draw(screen)
-
-	// FIXME: put into hud_system
-	op := &ebiten.DrawImageOptions{}
-	screen.DrawImage(assets.Assets["hud"], op)
-	ebitenutil.DebugPrintAt(screen, fmt.Sprintf(
-		"FPS: %02.f  TPS: %02.f",
-		ebiten.ActualFPS(),
-		ebiten.ActualTPS(),
-	), 10, 10)
-}

game/levels.go

@@ -2,18 +2,17 @@ package game
 
 import (
 	"image"
-	"log"
 	"log/slog"
 	"openquell/assets"
 	"openquell/components"
 	"openquell/grid"
 	"openquell/observers"
 	"openquell/systems"
-	"openquell/util"
 	"strings"
 
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/mlange-42/arche/ecs"
+	"github.com/solarlune/ldtkgo"
 )
 
 type Map map[image.Point]*assets.Tile
@@ -24,6 +23,7 @@ type Level struct {
 	World                   *ecs.World
 	Name                    string
 	Description             string
+	Number                  int
 	Mapslice                Map
 	BackupMapslice          Map
 	GridContainer           *grid.GridContainer
@@ -31,26 +31,31 @@ type Level struct {
 	Grid                    *grid.Grid
 }
 
-func NewLevel(game *Game, cellsize int, plan *assets.RawLevel) *Level {
+func NewLevel(game *Game, cellsize int, plan *ldtkgo.Level) *Level {
 	systemlist := []systems.System{}
 
 	gridcontainer := &grid.GridContainer{}
 
+	// FIXME: use plan.BGImage.Path here?
 	systemlist = append(systemlist,
-		systems.NewGridSystem(game.World, game.ScreenWidth, game.ScreenHeight, cellsize, plan.Background))
+		systems.NewGridSystem(game.World, game.ScreenWidth, game.ScreenHeight, cellsize,
+			assets.Assets[plan.PropertyByIdentifier("background").AsString()]))
 
 	systemlist = append(systemlist, systems.NewCollectibleSystem(game.World))
 
+	systemlist = append(systemlist, systems.NewObstacleSystem(game.World, gridcontainer))
+
 	systemlist = append(systemlist,
-		systems.NewPlayerSystem(game.World, gridcontainer))
+		systems.NewPlayerSystem(game.World, gridcontainer, game.ScreenWidth, game.ScreenHeight))
 
 	systemlist = append(systemlist, systems.NewParticleSystem(game.World, game.Cellsize))
 
-	systemlist = append(systemlist, systems.NewObstacleSystem(game.World, gridcontainer))
-
 	systemlist = append(systemlist, systems.NewTransientSystem(game.World, gridcontainer))
 
-	systemlist = append(systemlist, systems.NewDestroyableSystem(game.World, gridcontainer))
+	systemlist = append(systemlist, systems.NewDestroyableSystem(game.World, gridcontainer,
+		game.Cellsize))
+
+	systemlist = append(systemlist, systems.NewHudSystem(game.World, plan))
 
 	mapslice, backupmap := LevelToSlice(game, plan, cellsize)
 
@@ -61,8 +66,9 @@ func NewLevel(game *Game, cellsize int, plan *assets.RawLevel) *Level {
 		World:          game.World,
 		Width:          game.ScreenWidth,
 		Height:         game.ScreenHeight,
-		Description:    plan.Description,
-		Name:           plan.Name,
+		Description:    plan.PropertyByIdentifier("description").AsString(),
+		Number:         plan.PropertyByIdentifier("level").AsInt(),
+		Name:           strings.ReplaceAll(plan.Identifier, "_", " "),
 		GridContainer:  gridcontainer,
 		Systems:        systemlist,
 	}
@@ -80,13 +86,6 @@ func (level *Level) Draw(screen *ebiten.Image) {
 	}
 }
 
-func (level *Level) Position2Point(position *components.Position) image.Point {
-	return image.Point{
-		int(position.X) / level.Cellsize,
-		int(position.Y) / level.Cellsize,
-	}
-}
-
 func (level *Level) RestoreMap() {
 	for point, tile := range level.BackupMapslice {
 		level.Mapslice[point] = tile.Clone()
@@ -105,8 +104,8 @@ func (level *Level) SetupGrid(game *Game) {
 	level.World.Batch().RemoveEntities(selector)
 
 	// get rid of any players on PlayerObserver. FIXME: remove them in grid.NewGrid()?
-	playerobserver := observers.GetPlayerObserver(level.World)
-	playerobserver.RemoveEntities()
+	observer := observers.GetGameObserver(level.World)
+	observer.RemoveEntities()
 
 	// get rid of possibly manipulated map
 	level.RestoreMap()
@@ -117,26 +116,77 @@ func (level *Level) SetupGrid(game *Game) {
 		grid.NewGrid(game.World, level.Cellsize, level.Width, level.Height, level.Mapslice))
 }
 
-// parses a RawLevel and generates a mapslice from it, which is being used as grid
-func LevelToSlice(game *Game, level *assets.RawLevel, tilesize int) (Map, Map) {
+func NewMapSlice(game *Game, tilesize int) Map {
 	size := game.ScreenWidth * game.ScreenHeight
 	mapslice := make(Map, size)
-	backupmap := make(Map, size)
 
-	for y, line := range strings.Split(string(level.Data), "\n") {
-		if len(line) != game.ScreenWidth/tilesize && y < game.ScreenHeight/tilesize {
-			log.Fatalf("line %d doesn't contain %d tiles, but %d",
-				y, game.ScreenWidth/tilesize, len(line))
+	for y := 0; y < game.ScreenHeight; y += 32 {
+		for x := 0; x < game.ScreenWidth; x += 32 {
+			mapslice[image.Point{x / tilesize, y / tilesize}] = assets.Tiles["floor"]
+		}
 	}
 
-		for x, char := range line {
-			if !util.Exists(assets.Tiles, byte(char)) {
-				log.Fatalf("unregistered tile type %c encountered", char)
+	return mapslice
 }
 
-			tile := assets.Tiles[byte(char)]
-			mapslice[image.Point{x, y}] = tile
-			backupmap[image.Point{x, y}] = tile.Clone()
+// parses a RawLevel and generates a mapslice from it, which is being used as grid
+func LevelToSlice(game *Game, level *ldtkgo.Level, tilesize int) (Map, Map) {
+	mapslice := NewMapSlice(game, tilesize)
+	backupmap := NewMapSlice(game, tilesize)
+
+	for _, layer := range level.Layers {
+		switch layer.Type {
+		case ldtkgo.LayerTypeTile:
+			// load tile from LDTK tile layer, use sprites from associated map.
+
+			if tiles := layer.AllTiles(); len(tiles) > 0 {
+				for _, tileData := range tiles {
+					// Subimage the Tile  from the already loaded map,
+					//  but referenced  from  LDTK file,  that way  we
+					// could use multiple tileset images
+					tile := assets.Tiles["default"]
+
+					// FIXME: load from LDTK file
+					tile.Sprite = assets.Assets["primarymap"].SubImage(
+						image.Rect(tileData.Src[0],
+							tileData.Src[1],
+							tileData.Src[0]+layer.GridSize,
+							tileData.Src[1]+layer.GridSize)).(*ebiten.Image)
+
+					point := image.Point{
+						tileData.Position[0] / tilesize,
+						tileData.Position[1] / tilesize}
+
+					mapslice[point] = tile
+					backupmap[point] = tile.Clone()
+				}
+			}
+
+		case ldtkgo.LayerTypeEntity:
+			// load mobile tiles (they call them entities) using static map map.png.
+			tileset := assets.Assets["primarymap"]
+
+			for _, entity := range layer.Entities {
+				if entity.TileRect != nil {
+					tile := assets.Tiles[entity.Identifier]
+
+					slog.Debug("LOAD TILE", "tile", entity.TileRect)
+
+					tileRect := entity.TileRect
+
+					tile.Sprite = tileset.SubImage(
+						image.Rect(tileRect.X, tileRect.Y,
+							tileRect.X+tileRect.W,
+							tileRect.Y+tileRect.H)).(*ebiten.Image)
+
+					point := image.Point{
+						entity.Position[0] / tilesize,
+						entity.Position[1] / tilesize}
+
+					mapslice[point] = tile
+					backupmap[point] = tile.Clone()
+				}
+			}
 		}
 	}
 

game/nextlevel_scene.go

@@ -1,6 +1,7 @@
 package game
 
 import (
+	"fmt"
 	"image/color"
 	"log/slog"
 	"openquell/assets"
@@ -22,12 +23,11 @@ type NextlevelScene struct {
 	Lost     bool
 }
 
-func NewNextlevelScene(game *Game, lost bool) Scene {
+func NewNextlevelScene(game *Game) Scene {
 	scene := &NextlevelScene{
 		Whoami: Nextlevel,
 		Game:   game,
 		Next:   Nextlevel,
-		Lost:   lost,
 	}
 
 	scene.SetupUI()
@@ -61,7 +61,7 @@ func (scene *NextlevelScene) Update() error {
 func (scene *NextlevelScene) SetLevel(level int) {}
 
 func (scene *NextlevelScene) Draw(screen *ebiten.Image) {
-	background := assets.Assets["background-popup"]
+	background := assets.Assets["background-popup-wide"]
 
 	op := &ebiten.DrawImageOptions{}
 	op.GeoM.Translate(
@@ -69,34 +69,81 @@ func (scene *NextlevelScene) Draw(screen *ebiten.Image) {
 		float64((scene.Game.ScreenHeight/2)-(background.Bounds().Dy()/2)),
 	)
 
-	screen.DrawImage(assets.Assets["background-popup"], op)
+	screen.DrawImage(background, op)
 
 	scene.Ui.Draw(screen)
 }
 
 func (scene *NextlevelScene) SetupUI() {
+	observer := observers.GetGameObserver(scene.Game.World)
+	slog.Debug("levels", "max", observer.MaxLevels, "current", observer.CurrentLevel)
+	if observer.MaxLevels == observer.CurrentLevel+1 && !observer.Lost {
+		scene.SetupUILast()
+	} else {
+		scene.SetupUIRetry()
+	}
+
+}
+
+func (scene *NextlevelScene) SetupUILast() {
 	blue := color.RGBA{0, 255, 128, 255}
-	gameobserver := observers.GetGameObserver(scene.Game.World)
+	observer := observers.GetGameObserver(scene.Game.World)
 
 	rowContainer := gameui.NewRowContainer(false)
-	labeltext := "Success"
+	label1text := "Last level, congratulations!"
+	label2text := fmt.Sprintf("Your final score: %d", observer.GetScore())
 
-	switch scene.Lost {
+	buttonMenu := gameui.NewMenuButton("Menu", *assets.FontRenderer.FontNormal,
+		func(args *widget.ButtonClickedEventArgs) {
+			scene.SetNext(Menu)
+		})
+
+	label1 := widget.NewText(
+		widget.TextOpts.Text(label1text, *assets.FontRenderer.FontNormal, blue),
+		widget.TextOpts.Position(widget.TextPositionCenter, widget.TextPositionCenter),
+	)
+
+	label2 := widget.NewText(
+		widget.TextOpts.Text(label2text, *assets.FontRenderer.FontNormal, blue),
+		widget.TextOpts.Position(widget.TextPositionCenter, widget.TextPositionCenter),
+	)
+
+	rowContainer.AddChild(label1)
+	rowContainer.AddChild(label2)
+	rowContainer.AddChild(buttonMenu)
+
+	scene.Ui = &ebitenui.UI{
+		Container: rowContainer.Container(),
+	}
+}
+
+func (scene *NextlevelScene) SetupUIRetry() {
+	blue := color.RGBA{0, 255, 128, 255}
+	observer := observers.GetGameObserver(scene.Game.World)
+	buttonNext := &widget.Button{}
+
+	rowContainer := gameui.NewRowContainer(false)
+	labeltext := fmt.Sprintf("Great! (Score: %d)", observer.GetLevelScore())
+	islast := observer.MaxLevels == observer.CurrentLevel+1
+
+	switch observer.Lost {
 	case true:
-		labeltext = "Failure"
+		labeltext = "Too bad!"
 	}
 
 	buttonRetry := gameui.NewMenuButton("Retry", *assets.FontRenderer.FontNormal,
 		func(args *widget.ButtonClickedEventArgs) {
 			scene.SetNext(Play)
-			gameobserver.Retry = true
+			observer.Retry = true
 		})
 
-	buttonNext := gameui.NewMenuButton("Next Level", *assets.FontRenderer.FontNormal,
+	if !islast {
+		buttonNext = gameui.NewMenuButton("Next Level", *assets.FontRenderer.FontNormal,
 			func(args *widget.ButtonClickedEventArgs) {
 				scene.SetNext(Play)
-			gameobserver.Retry = false
+				observer.Retry = false
 			})
+	}
 
 	buttonAbort := gameui.NewMenuButton("Abort", *assets.FontRenderer.FontNormal,
 		func(args *widget.ButtonClickedEventArgs) {
@@ -104,12 +151,14 @@ func (scene *NextlevelScene) SetupUI() {
 		})
 
 	label := widget.NewText(
-		widget.TextOpts.Text(labeltext, *assets.FontRenderer.FontBig, blue),
+		widget.TextOpts.Text(labeltext, *assets.FontRenderer.FontNormal, blue),
 		widget.TextOpts.Position(widget.TextPositionCenter, widget.TextPositionCenter),
 	)
 
 	rowContainer.AddChild(label)
+	if !islast {
 		rowContainer.AddChild(buttonNext)
+	}
 	rowContainer.AddChild(buttonRetry)
 	rowContainer.AddChild(buttonAbort)
 

game/play_scene.go

@@ -0,0 +1,101 @@
+package game
+
+import (
+	"image"
+	"log/slog"
+	"openquell/assets"
+	"openquell/config"
+
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
+)
+
+type PlayScene struct {
+	Game         *Game
+	CurrentLevel int
+	Levels       []*Level
+	Next         SceneName
+	Whoami       SceneName
+	UseCache     bool
+	MenuRect     image.Rectangle
+}
+
+// Implements the actual playing Scene
+func NewPlayScene(game *Game, startlevel int) Scene {
+	scene := &PlayScene{Whoami: Play, Next: Play, Game: game}
+
+	scene.GenerateLevels(game)
+	scene.SetLevel(startlevel)
+	scene.MenuRect = image.Rect(config.MenuRectX, config.MenuRectY,
+		config.MenuRectX+config.MenuRectCellsize,
+		config.MenuRectY+config.MenuRectCellsize)
+
+	return scene
+}
+
+func (scene *PlayScene) GenerateLevels(game *Game) {
+	min := []int{}
+	for _, level := range assets.Project.Levels {
+		level := level
+		scene.Levels = append(scene.Levels, NewLevel(game, 32, level))
+		min = append(min, level.PropertyByIdentifier("minmoves").AsInt())
+	}
+
+	scene.Game.Observer.SetupLevelScore(min)
+	scene.Game.Observer.SetupMaxLevels(len(min))
+	scene.Game.Levels = scene.Levels
+}
+
+func (scene *PlayScene) SetLevel(level int) {
+	scene.CurrentLevel = level
+	scene.Levels[scene.CurrentLevel].SetupGrid(scene.Game)
+}
+
+// Interface methods
+func (scene *PlayScene) SetNext(next SceneName) {
+	scene.Next = next
+}
+
+func (scene *PlayScene) GetNext() SceneName {
+	// FIXME: set to winner or options screen
+	return scene.Next
+}
+
+func (scene *PlayScene) ResetNext() {
+	scene.Next = scene.Whoami
+}
+
+func (scene *PlayScene) Clearscreen() bool {
+	return false
+}
+
+func (scene *PlayScene) Update() error {
+	scene.Levels[scene.CurrentLevel].Update()
+
+	switch {
+	case inpututil.IsKeyJustPressed(ebiten.KeyEscape):
+		scene.SetNext(Popup)
+
+	case inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft):
+		// ok we're checking the menu button here, but drawing it in hud_system,
+		// because systems can't switch scenes
+		if image.Pt(ebiten.CursorPosition()).In(scene.MenuRect) {
+			scene.SetNext(Popup)
+		}
+	}
+
+	return nil
+}
+
+func (scene *PlayScene) Draw(screen *ebiten.Image) {
+	// FIXME: why not in Update() ?!?!?!
+	if scene.CurrentLevel != scene.Game.Observer.CurrentLevel {
+		slog.Debug("level", "current", scene.CurrentLevel,
+			"next", scene.Game.Observer.CurrentLevel)
+		scene.CurrentLevel = scene.Game.Observer.CurrentLevel
+		scene.Levels[scene.CurrentLevel].SetupGrid(scene.Game)
+	}
+
+	screen.Clear()
+	scene.Levels[scene.CurrentLevel].Draw(screen)
+}

game/popup_scene.go

@@ -5,11 +5,13 @@ import (
 	"log/slog"
 	"openquell/assets"
 	"openquell/gameui"
+	"openquell/observers"
 
 	"github.com/ebitenui/ebitenui"
 	"github.com/ebitenui/ebitenui/widget"
 
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
 )
 
 type PopupScene struct {
@@ -50,6 +52,11 @@ func (scene *PopupScene) Clearscreen() bool {
 
 func (scene *PopupScene) Update() error {
 	scene.Ui.Update()
+
+	if inpututil.IsKeyJustPressed(ebiten.KeyEscape) {
+		scene.SetNext(Play)
+	}
+
 	return nil
 }
 
@@ -69,6 +76,7 @@ func (scene *PopupScene) Draw(screen *ebiten.Image) {
 
 func (scene *PopupScene) SetupUI() {
 	blue := color.RGBA{0, 255, 128, 255}
+	observer := observers.GetGameObserver(scene.Game.World)
 
 	rowContainer := gameui.NewRowContainer(false)
 
@@ -82,9 +90,10 @@ func (scene *PopupScene) SetupUI() {
 			scene.SetNext(Menu)
 		})
 
-	buttonOptions := gameui.NewMenuButton("Options", *assets.FontRenderer.FontNormal,
+	buttonRetry := gameui.NewMenuButton("Retry", *assets.FontRenderer.FontNormal,
 		func(args *widget.ButtonClickedEventArgs) {
-			scene.SetNext(Settings)
+			scene.SetNext(Play)
+			observer.Retry = true
 		})
 
 	label := widget.NewText(
@@ -94,8 +103,8 @@ func (scene *PopupScene) SetupUI() {
 
 	rowContainer.AddChild(label)
 	rowContainer.AddChild(buttonContinue)
+	rowContainer.AddChild(buttonRetry)
 	rowContainer.AddChild(buttonAbort)
-	rowContainer.AddChild(buttonOptions)
 
 	scene.Ui = &ebitenui.UI{
 		Container: rowContainer.Container(),

game/select_scene.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ebitenui/ebitenui/widget"
 
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
 )
 
 type SelectScene struct {
@@ -53,6 +54,11 @@ func (scene *SelectScene) Clearscreen() bool {
 
 func (scene *SelectScene) Update() error {
 	scene.Ui.Update()
+
+	if inpututil.IsKeyJustPressed(ebiten.KeyEscape) {
+		scene.SetNext(Menu)
+	}
+
 	return nil
 }
 
@@ -62,6 +68,7 @@ func (scene *SelectScene) Draw(screen *ebiten.Image) {
 
 type LevelEntry struct {
 	Id     int
+	Number int
 	Name   string
 }
 
@@ -79,7 +86,7 @@ func (scene *SelectScene) SetupUI() {
 
 	levels := make([]any, 0, len(scene.Game.Levels))
 	for id := 0; id < len(scene.Game.Levels); id++ {
-		levels = append(levels, LevelEntry{Id: id, Name: scene.Game.Levels[id].Name})
+		levels = append(levels, LevelEntry{Id: id, Number: scene.Game.Levels[id].Number, Name: scene.Game.Levels[id].Name})
 	}
 
 	slog.Debug("levels", "levels", levels)
@@ -92,10 +99,10 @@ func (scene *SelectScene) SetupUI() {
 		// Set how wide the list should be
 		widget.ListOpts.ContainerOpts(widget.ContainerOpts.WidgetOpts(
 			widget.WidgetOpts.MinSize(150, 0),
-			widget.WidgetOpts.LayoutData(widget.AnchorLayoutData{
-				HorizontalPosition: widget.AnchorLayoutPositionCenter,
-				VerticalPosition:   widget.AnchorLayoutPositionEnd,
-				StretchVertical:    true,
+			widget.WidgetOpts.LayoutData(widget.RowLayoutData{
+				Position:  widget.RowLayoutPositionCenter,
+				Stretch:   true,
+				MaxHeight: 200,
 			}),
 		)),
 		// Set the entries in the list
@@ -123,18 +130,18 @@ func (scene *SelectScene) SetupUI() {
 		widget.ListOpts.EntryFontFace(*assets.FontRenderer.FontNormal),
 		// Set the colors for the list
 		widget.ListOpts.EntryColor(&widget.ListEntryColor{
-			Selected:                   color.NRGBA{0, 255, 0, 255},                 // Foreground color for the unfocused selected entry
-			Unselected:                 color.NRGBA{254, 255, 255, 255},             // Foreground color for the unfocused unselected entry
-			SelectedBackground:         color.NRGBA{R: 130, G: 130, B: 200, A: 255}, // Background color for the unfocused selected entry
-			SelectedFocusedBackground:  color.NRGBA{R: 130, G: 130, B: 170, A: 255}, // Background color for the focused selected entry
-			FocusedBackground:          color.NRGBA{R: 170, G: 170, B: 180, A: 255}, // Background color for the focused unselected entry
-			DisabledUnselected:         color.NRGBA{100, 100, 100, 255},             // Foreground color for the disabled unselected entry
-			DisabledSelected:           color.NRGBA{100, 100, 100, 255},             // Foreground color for the disabled selected entry
-			DisabledSelectedBackground: color.NRGBA{100, 100, 100, 255},             // Background color for the disabled selected entry
+			Selected:                   color.NRGBA{0, 255, 0, 255},
+			Unselected:                 color.NRGBA{254, 255, 255, 255},
+			SelectedBackground:         color.NRGBA{R: 130, G: 130, B: 200, A: 255},
+			SelectedFocusedBackground:  color.NRGBA{R: 130, G: 130, B: 170, A: 255},
+			FocusedBackground:          color.NRGBA{R: 170, G: 170, B: 180, A: 255},
+			DisabledUnselected:         color.NRGBA{100, 100, 100, 255},
+			DisabledSelected:           color.NRGBA{100, 100, 100, 255},
+			DisabledSelectedBackground: color.NRGBA{100, 100, 100, 255},
 		}),
 		// This required function returns the string displayed in the list
 		widget.ListOpts.EntryLabelFunc(func(e interface{}) string {
-			return e.(LevelEntry).Name
+			return fmt.Sprintf("%02d %s", e.(LevelEntry).Number, e.(LevelEntry).Name)
 		}),
 		// Padding for each entry
 		widget.ListOpts.EntryTextPadding(widget.NewInsetsSimple(5)),
@@ -148,14 +155,31 @@ func (scene *SelectScene) SetupUI() {
 		}),
 	)
 
+	buttonContainer := widget.NewContainer(
+		widget.ContainerOpts.Layout(widget.NewGridLayout(
+			widget.GridLayoutOpts.Columns(2),
+			widget.GridLayoutOpts.Padding(widget.NewInsetsSimple(30)),
+			widget.GridLayoutOpts.Spacing(20, 10),
+			widget.GridLayoutOpts.Stretch([]bool{true, false}, []bool{false, true}),
+		)),
+	)
+
 	buttonPlay := gameui.NewMenuButton("Play selected level", *assets.FontRenderer.FontNormal,
 		func(args *widget.ButtonClickedEventArgs) {
 			scene.SetNext(Play)
 		})
 
+	buttonAbort := gameui.NewMenuButton("Back", *assets.FontRenderer.FontNormal,
+		func(args *widget.ButtonClickedEventArgs) {
+			scene.SetNext(Menu)
+		})
+
+	buttonContainer.AddChild(buttonPlay)
+	buttonContainer.AddChild(buttonAbort)
+
 	rowContainer.AddChild(label)
 	rowContainer.AddChild(list)
-	rowContainer.AddChild(buttonPlay)
+	rowContainer.AddChild(buttonContainer)
 
 	scene.Ui = &ebitenui.UI{
 		Container: rowContainer.Container(),

go.mod

@@ -3,34 +3,37 @@ module openquell
 go 1.21
 
 require (
+	github.com/alecthomas/repr v0.3.0
+	github.com/ebitenui/ebitenui v0.5.6-0.20240319232637-752494bdfcac
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/hajimehoshi/ebiten/v2 v2.6.6
+	github.com/knadh/koanf v1.5.0
 	github.com/mlange-42/arche v0.10.0
+	github.com/solarlune/ldtkgo v0.9.4-0.20240310011150-66aa15c2ab56
+	github.com/spf13/pflag v1.0.5
+	github.com/tinne26/etxt v0.0.8
+	github.com/tlinden/yadu v0.1.3
+	golang.org/x/image v0.15.0
 )
 
 require (
-	github.com/alecthomas/repr v0.3.0 // indirect
-	github.com/ebitengine/purego v0.6.0 // indirect
-	github.com/ebitenui/ebitenui v0.5.5 // indirect
+	github.com/ebitengine/purego v0.6.1 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/hajimehoshi/ebiten v1.12.12 // indirect
-	github.com/jezek/xgb v1.1.0 // indirect
-	github.com/knadh/koanf v1.5.0 // indirect
+	github.com/jezek/xgb v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/tinne26/etxt v0.0.8 // indirect
-	github.com/tlinden/yadu v0.1.3 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/image v0.12.0 // indirect
-	golang.org/x/mobile v0.0.0-20230922142353-e2f452493d57 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/tidwall/gjson v1.9.3 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+	golang.org/x/exp/shiny v0.0.0-20240222234643-814bf88cf225 // indirect
+	golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,7 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/alecthomas/repr v0.3.0 h1:NeYzUPfjjlqHY4KtzgKJiWd6sVq2eNUPTi34PiFGjY8=
 github.com/alecthomas/repr v0.3.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -36,14 +35,13 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/ebitengine/purego v0.5.0 h1:JrMGKfRIAM4/QVKaesIIT7m/UVjTj5GYhRSQYwfVdpo=
-github.com/ebitengine/purego v0.5.0/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
-github.com/ebitengine/purego v0.6.0 h1:Yo9uBc1x+ETQbfEaf6wcBsjrQfCEnh/gaGUg7lguEJY=
-github.com/ebitengine/purego v0.6.0/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
-github.com/ebitenui/ebitenui v0.5.5 h1:L9UCWmiMlo4sG5TavQKmjfsnwMmYqkld2tXWZMmKkSA=
-github.com/ebitenui/ebitenui v0.5.5/go.mod h1:CkzAwu9Ks32P+NC/7+iypdLA85Wqnn93UztPFE+kAH4=
+github.com/ebitengine/purego v0.6.1 h1:sjN8rfzbhXQ59/pE+wInswbU9aMDHiwlup4p/a07Mkg=
+github.com/ebitengine/purego v0.6.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
+github.com/ebitenui/ebitenui v0.5.6-0.20240319232637-752494bdfcac h1:lwCaGTkCrK7omCX9HEiWjxClpUg+NIvTpyUDk9C0pdo=
+github.com/ebitenui/ebitenui v0.5.6-0.20240319232637-752494bdfcac/go.mod h1:I0rVbTOUi7gWKTPet2gzbvhOdkHp5pJXMM6c6b3dRoE=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -54,11 +52,9 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200707082815-5321531c36a2/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
@@ -69,7 +65,6 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
@@ -105,17 +100,10 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hajimehoshi/bitmapfont v1.3.0/go.mod h1:/Qb7yVjHYNUV4JdqNkPs6BSZwLjKqkZOMIp6jZD0KgE=
-github.com/hajimehoshi/ebiten v1.12.12 h1:JvmF1bXRa+t+/CcLWxrJCRsdjs2GyBYBSiFAfIqDFlI=
-github.com/hajimehoshi/ebiten v1.12.12/go.mod h1:1XI25ImVCDPJiXox4h9yK/CvN5sjDYnbF4oZcFzPXHw=
-github.com/hajimehoshi/ebiten/v2 v2.6.5 h1:lALv+qhEK3CBWViyiGpz4YcR6slVJEjCiS7sExKZ9OE=
-github.com/hajimehoshi/ebiten/v2 v2.6.5/go.mod h1:TZtorL713an00UW4LyvMeKD8uXWnuIuCPtlH11b0pgI=
+github.com/hajimehoshi/bitmapfont/v3 v3.0.0 h1:r2+6gYK38nfztS/et50gHAswb9hXgxXECYgE8Nczmi4=
+github.com/hajimehoshi/bitmapfont/v3 v3.0.0/go.mod h1:+CxxG+uMmgU4mI2poq944i3uZ6UYFfAkj9V6WqmuvZA=
 github.com/hajimehoshi/ebiten/v2 v2.6.6 h1:E5X87Or4VwKZIKjeC9+Vr4ComhZAz9h839myF4Q21kc=
 github.com/hajimehoshi/ebiten/v2 v2.6.6/go.mod h1:gKgQI26zfoSb6j5QbrEz2L6nuHMbAYwrsXa5qsGrQKo=
-github.com/hajimehoshi/file2byteslice v0.0.0-20200812174855-0e5e8a80490e/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE=
-github.com/hajimehoshi/go-mp3 v0.3.1/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
-github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
-github.com/hajimehoshi/oto v0.6.8/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
 github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -140,6 +128,7 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
@@ -149,14 +138,13 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI
 github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs=
 github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E=
-github.com/jakecoffman/cp v1.0.0/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg=
-github.com/jezek/xgb v1.1.0 h1:wnpxJzP1+rkbGclEkmwpVFQWpuE2PUGNUzP8SbfFobk=
-github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
-github.com/jfreymuth/oggvorbis v1.0.1/go.mod h1:NqS+K+UXKje0FUYUPosyQ+XTVvjmVjps1aEZH1sumIk=
-github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0=
+github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4=
+github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -173,8 +161,13 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
+github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -215,17 +208,17 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
@@ -246,6 +239,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
@@ -253,25 +248,34 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/solarlune/ldtkgo v0.9.4-0.20240310011150-66aa15c2ab56 h1:QW8w9YQbIlIW053jM2SfBKAFGyd4maoq0AawZsb9rO4=
+github.com/solarlune/ldtkgo v0.9.4-0.20240310011150-66aa15c2ab56/go.mod h1:PP4XtlnCSwWo7iexI/NJ3aS3INmiT42o066o6Dx52rs=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tidwall/gjson v1.9.3 h1:hqzS9wAHMO+KVBBkLxYdkEeeFHuqr95GfClRLKlgK0E=
+github.com/tidwall/gjson v1.9.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tinne26/etxt v0.0.8 h1:rjb58jkMkapRGLmhBMWnT76E/nMTXC5P1Q956BRZkoc=
 github.com/tinne26/etxt v0.0.8/go.mod h1:QM/hlNkstsKC39elTFNKAR34xsMb9QoVosf+g9wlYxM=
-github.com/tlinden/yadu v0.1.2 h1:TYYVnUJwziRJ9YPbIbRf9ikmDw0Q8Ifixm+J/kBQFh8=
-github.com/tlinden/yadu v0.1.2/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
 github.com/tlinden/yadu v0.1.3 h1:5cRCUmj+l5yvlM2irtpFBIJwVV2DPEgYSaWvF19FtcY=
 github.com/tlinden/yadu v0.1.3/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
@@ -280,41 +284,26 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
-golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63 h1:3AGKexOYqL+ztdWdkB1bDwXgPBuTS/S8A4WzuTvJ8Cg=
-golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200801110659-972c09e46d76/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.12.0 h1:w13vZbU4o5rKOFFR8y7M+c4A5jXDC0uXTdHYRP8X2DQ=
-golang.org/x/image v0.12.0/go.mod h1:Lu90jvHG7GfemOIcldsh9A2hS01ocl6oNO7ype5mEnk=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
+golang.org/x/exp/shiny v0.0.0-20240222234643-814bf88cf225 h1:5c1vh6Z0LHEVurVuFE5ElIYhjVG+nP7ZGFB3yx9yTVA=
+golang.org/x/exp/shiny v0.0.0-20240222234643-814bf88cf225/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
+golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mobile v0.0.0-20210208171126-f462b3930c8f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
-golang.org/x/mobile v0.0.0-20230922142353-e2f452493d57 h1:Q6NT8ckDYNcwmi/bmxe+XbiDMXqMRW1xFBtJ+bIpie4=
-golang.org/x/mobile v0.0.0-20230922142353-e2f452493d57/go.mod h1:wEyOn6VvNW7tcf+bW/wBz1sehi2s2BZ4TimyR7qZen4=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075 h1:iZzqyDd8gFkJZpsJNzveyScRBcQlsveheh6Q77LzhPY=
+golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075/go.mod h1:Y8Bnziw2dX69ZhYuqQB8Ihyjks1Q6fMmbg17j9+ISNA=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -332,8 +321,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -343,14 +330,11 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -358,11 +342,9 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -375,7 +357,6 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -384,46 +365,31 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -459,7 +425,8 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

grid/collider.go

@@ -5,6 +5,36 @@ import (
 	. "openquell/config"
 )
 
+// Check a collision  on the grid. We check if  the entity in question
+// bumps into the  egde of the grid  or if it bumps onto  a solid wall
+// tile. For both cases the user must provide responder funcs in which
+// it must be implemented how to react on those events.
+func (grid *Grid) CheckGridCollision(
+	position *components.Position,
+	velocity *components.Velocity,
+	respond_edge func(*components.Position, *components.Velocity, *components.Position),
+	respond_solid func(*components.Position, *components.Velocity, *components.Position),
+) {
+
+	if velocity.Moving() {
+		ok, newpos := grid.BumpEdge(position, velocity)
+		if ok {
+			//slog.Debug("falling off the edge", "newpos", newpos)
+			respond_edge(position, velocity, newpos)
+		} else {
+			ok, tilepos := grid.GetSolidNeighborPosition(position, velocity, true)
+			if ok {
+				// slog.Debug("HaveSolidNeighbor", "ok", ok, "tilepos",
+				// 	tilepos.Point(), "playerpos", playerposition)
+				intersects, newpos := tilepos.Intersects(position, velocity)
+				if intersects {
+					respond_solid(position, velocity, newpos)
+				}
+			}
+		}
+	}
+}
+
 func (grid *Grid) GetSolidNeighborPosition(
 	position *components.Position,
 	velocity *components.Velocity,

grid/grid.go

@@ -71,8 +71,10 @@ func NewGrid(world *ecs.World,
 	var player *components.Player
 	var destroyable *components.Destroyable
 
-	playerobserver := observers.GetPlayerObserver(world)
-	obstacleobserver := observers.GetObstacleObserver(world)
+	playerID := ecs.ComponentID[components.Player](world)
+	obstacleID := ecs.ComponentID[components.Obstacle](world)
+
+	observer := observers.GetGameObserver(world)
 
 	for point, tile := range mapslice {
 		switch tile.Renderable {
@@ -84,10 +86,11 @@ func NewGrid(world *ecs.World,
 			case tile.Player:
 				entity := playermapper.New()
 				pos, vel, render, player = playermapper.Get(entity)
-				playerobserver.AddEntity(entity)
+				observer.AddEntity(entity, playerID)
 				vel.Speed = config.PLAYERSPEED
 				player.IsPrimary = tile.IsPrimary
 				player.Sprites = tile.Tiles
+				player.LoopPos = &components.Position{Cellsize: tilesize}
 			case tile.Collectible:
 				entity := colmapper.New()
 				pos, render, _ = colmapper.Get(entity)
@@ -97,7 +100,7 @@ func NewGrid(world *ecs.World,
 				vel.Direction = tile.Direction
 				vel.PointingAt = tile.Direction
 				vel.Speed = config.PLAYERSPEED
-				obstacleobserver.AddEntity(entity)
+				observer.AddEntity(entity, obstacleID)
 			case tile.Transient:
 				entity := transmapper.New()
 				pos, render, transient = transmapper.Get(entity)
@@ -106,10 +109,17 @@ func NewGrid(world *ecs.World,
 				entity := doormapper.New()
 				pos, render, destroyable = doormapper.Get(entity)
 				destroyable.Sprites = tile.Tiles
+				render.DamageImage = tile.Alpha
+				render.Shader = tile.Shader
+				render.Damaged = 0
 			default:
 				log.Fatalln("unsupported tile type encountered")
 			}
 
+			// FIXME:  this image  is never being  used because  it is
+			// being overwritten in game/levels.go:LevelToSlice(). The
+			// image is  taken from the LDTK map, not  from the Tile{}
+			// definition anymore
 			render.Image = tile.Sprite
 
 		default:
@@ -155,7 +165,7 @@ func (grid *Grid) RemoveTile(point image.Point) {
 }
 
 func (grid *Grid) SetFloorTile(point image.Point) {
-	grid.Map[point] = assets.Tiles[' ']
+	grid.Map[point] = assets.Tiles["floor"]
 }
 
 func (grid *Grid) SetSolidTile(tile *assets.Tile, point image.Point) {

index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<script src="wasm_exec.js"></script>
+<script>
+// Polyfill
+if (!WebAssembly.instantiateStreaming) {
+    WebAssembly.instantiateStreaming = async (resp, importObject) => {
+        const source = await (await resp).arrayBuffer();
+        return await WebAssembly.instantiate(source, importObject);
+    };
+}
+
+const go = new Go();
+WebAssembly.instantiateStreaming(fetch("openquell.wasm"), go.importObject).then(result => {
+    go.run(result.instance);
+});
+</script>

level-mode.el

@@ -1,18 +0,0 @@
-(define-derived-mode level-mode text-mode "level mode"
-  "game levels"
-  (setq buffer-face-mode-face '(:family "Monaco-10:spacing=110" :height 100 ))
-  )
-
-(defun level-delete-char()
-  (interactive)
-  (when (< 2 (line-number-at-pos))
-    (delete-char 1)))
-
-(add-hook 'level-mode-hook 'whitespace-mode)
-(add-hook 'level-mode-hook (lambda() (hungry-delete-mode 0)))
-
-(add-hook 'level-mode-hook
-          (lambda ()
-            (add-hook 'post-self-insert-hook 'level-delete-char nil 'make-it-local)))
-
-(provide 'level-mode)

local.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src="main.html" width="640" height="480"></iframe>

observers/game_observer.go

@@ -1,31 +1,81 @@
 package observers
 
 import (
+	"math/rand"
 	"openquell/components"
 
+	"log/slog"
+
 	"github.com/mlange-42/arche/ecs"
+	"github.com/mlange-42/arche/ecs/event"
 	"github.com/mlange-42/arche/generic"
+	"github.com/mlange-42/arche/listener"
 )
 
-// Used for global game state
+type Score struct {
+	Min, Score int
+}
+
+// Used for global game state. Also stores mobile entities of the
+// current level. The Entities map will be reset on each level
+// initialization in grid/grid.go
 type GameObserver struct {
-	CurrentLevel, Width     int
+	World                      *ecs.World
+	CurrentLevel, Width, Moves int
 	Height, Cellsize, Score    int
 	StopTimer                  *components.Timer
 	Lost                       bool // set to true if player is struck or something, by default: win!
 	Retry                      bool
 	NextlevelText              string
+	Entities                   map[ecs.ID]map[ecs.Entity]int
+	LevelScore                 map[int]*Score // one score per level
+	Id                         int
+	MaxLevels                  int
 }
 
-func NewGameObserver(world *ecs.World, startlevel, width, height, cellsize int) *GameObserver {
+func (observer *GameObserver) GetListenerCallback(comp ecs.ID) listener.Callback {
+	return listener.NewCallback(
+		func(world *ecs.World, event ecs.EntityEvent) {
+			observer.RemoveEntity(event.Entity, comp)
+		},
+		event.EntityRemoved,
+		comp,
+	)
+}
+
+func NewGameObserver(
+	world *ecs.World, startlevel, width, height, cellsize int) *GameObserver {
 	observer := &GameObserver{
 		CurrentLevel: startlevel,
 		StopTimer:    &components.Timer{},
 		Width:        width,
 		Height:       height,
 		Cellsize:     cellsize,
+		World:        world,
+		Id:           rand.Intn(1000),
 	}
 
+	playerID := ecs.ComponentID[components.Player](world)
+	obstacleID := ecs.ComponentID[components.Obstacle](world)
+	particleID := ecs.ComponentID[components.Particle](world)
+
+	playerListener := observer.GetListenerCallback(playerID)
+	obstacleListener := observer.GetListenerCallback(obstacleID)
+	particleListener := observer.GetListenerCallback(particleID)
+
+	listen := listener.NewDispatch(
+		&playerListener,
+		&obstacleListener,
+		&particleListener,
+	)
+
+	world.SetListener(&listen)
+
+	observer.Entities = make(map[ecs.ID]map[ecs.Entity]int)
+	observer.Entities[playerID] = make(map[ecs.Entity]int)
+	observer.Entities[obstacleID] = make(map[ecs.Entity]int)
+	observer.Entities[particleID] = make(map[ecs.Entity]int)
+
 	resmanger := generic.NewResource[GameObserver](world)
 	resmanger.Add(observer)
 
@@ -33,11 +83,105 @@ func NewGameObserver(world *ecs.World, startlevel, width, height, cellsize int)
 }
 
 func GetGameObserver(world *ecs.World) *GameObserver {
-	observerID := ecs.ResourceID[GameObserver](world)
-	observer := world.Resources().Get(observerID).(*GameObserver)
+	resmanger := generic.NewResource[GameObserver](world)
+	observer := resmanger.Get()
+
 	return observer
 }
 
 func (observer *GameObserver) Gameover() {
 	observer.Lost = true
 }
+
+func (observer *GameObserver) AddEntity(entity ecs.Entity, comp ecs.ID) {
+	observer.Entities[comp][entity] = 1
+}
+
+func (observer *GameObserver) RemoveEntity(entity ecs.Entity, comp ecs.ID) {
+	delete(observer.Entities[comp], entity)
+}
+
+func (observer *GameObserver) GetEntities(comp ecs.ID) []ecs.Entity {
+	keys := make([]ecs.Entity, 0, len(observer.Entities[comp]))
+	for k, _ := range observer.Entities[comp] {
+		keys = append(keys, k)
+	}
+	return keys
+}
+
+func (observer *GameObserver) GetPlayers() []ecs.Entity {
+	playerID := ecs.ComponentID[components.Player](observer.World)
+	return observer.GetEntities(playerID)
+}
+
+func (observer *GameObserver) GetObstacles() []ecs.Entity {
+	obstacleID := ecs.ComponentID[components.Obstacle](observer.World)
+	return observer.GetEntities(obstacleID)
+}
+
+func (observer *GameObserver) GetParticles() []ecs.Entity {
+	particleID := ecs.ComponentID[components.Particle](observer.World)
+	return observer.GetEntities(particleID)
+}
+
+func (observer *GameObserver) RemoveEntities() {
+	playerID := ecs.ComponentID[components.Player](observer.World)
+	obstacleID := ecs.ComponentID[components.Obstacle](observer.World)
+	particleID := ecs.ComponentID[components.Particle](observer.World)
+
+	observer.Entities = make(map[ecs.ID]map[ecs.Entity]int)
+	observer.Entities[playerID] = make(map[ecs.Entity]int)
+	observer.Entities[obstacleID] = make(map[ecs.Entity]int)
+	observer.Entities[particleID] = make(map[ecs.Entity]int)
+}
+
+func (observer *GameObserver) SetupLevelScore(min []int) {
+	observer.LevelScore = make(map[int]*Score, len(min))
+
+	for level, minmoves := range min {
+		observer.LevelScore[level] = &Score{Min: minmoves}
+	}
+}
+
+func (observer *GameObserver) SetupMaxLevels(count int) {
+	observer.MaxLevels = count
+}
+
+// set current level stats and reset counters
+func (observer *GameObserver) AddScore() {
+	level := observer.CurrentLevel
+	moves := observer.Moves
+
+	slog.Debug("AddScore", "moves", observer.Moves)
+
+	if observer.Lost {
+		observer.LevelScore[level].Score = 0
+		slog.Debug("lost")
+	} else {
+		observer.LevelScore[level].Score = ((observer.LevelScore[level].Min * 100) / moves) / 30
+		slog.Debug("won", "score", observer.LevelScore[level].Score,
+			"Min", observer.LevelScore[level].Min,
+			"Min-x-100", observer.LevelScore[level].Min*100,
+			"Min-x-100-moves", (observer.LevelScore[level].Min*100)/moves,
+		)
+	}
+
+	observer.Moves = 0
+}
+
+func (observer *GameObserver) AddMove() {
+	observer.Moves++
+}
+
+func (observer *GameObserver) GetScore() int {
+	sum := 0
+	for _, score := range observer.LevelScore {
+		sum += score.Score
+	}
+
+	return sum
+}
+
+func (observer *GameObserver) GetLevelScore() int {
+	return observer.LevelScore[observer.CurrentLevel].Score
+}

observers/obstacle_observer.go

@@ -1,54 +0,0 @@
-package observers
-
-import (
-	"github.com/mlange-42/arche/ecs"
-	"github.com/mlange-42/arche/ecs/event"
-	"github.com/mlange-42/arche/generic"
-	"github.com/mlange-42/arche/listener"
-)
-
-// will be added as  an ecs.Resource to the world so we  can use it in
-// CollisionSystem to dynamically make it appear or disappear
-type ObstacleObserver struct {
-	// we only have one obstacle so far, if we use multiple ones, turn
-	// this in to a map, see player_observer.go for an example
-	Entities map[ecs.Entity]int
-}
-
-// Create a  new resource of  type PlayerObserver which will  hold all
-// obstacle  entities.   We  also  add  a  Listener  which  looks  for
-// EntityRemoved events and  if a player gets removed,  we also remove
-// it from the Entity map in our observer.
-func NewObstacleObserver(world *ecs.World) {
-	observer := &ObstacleObserver{}
-	observer.Entities = make(map[ecs.Entity]int)
-
-	resmanger := generic.NewResource[ObstacleObserver](world)
-	resmanger.Add(observer)
-
-	listen := listener.NewCallback(
-		func(world *ecs.World, event ecs.EntityEvent) {
-			observerID := ecs.ResourceID[ObstacleObserver](world)
-			observer := world.Resources().Get(observerID).(*ObstacleObserver)
-			observer.RemoveEntity(event.Entity)
-		},
-
-		event.EntityRemoved,
-	)
-
-	world.SetListener(&listen)
-}
-
-func GetObstacleObserver(world *ecs.World) *ObstacleObserver {
-	observerID := ecs.ResourceID[ObstacleObserver](world)
-	observer := world.Resources().Get(observerID).(*ObstacleObserver)
-	return observer
-}
-
-func (observer *ObstacleObserver) AddEntity(entity ecs.Entity) {
-	observer.Entities[entity] = 1
-}
-
-func (observer *ObstacleObserver) RemoveEntity(entity ecs.Entity) {
-	observer.Entities = make(map[ecs.Entity]int)
-}

observers/particle_observer.go

@@ -1,53 +0,0 @@
-package observers
-
-import (
-	"github.com/mlange-42/arche/ecs"
-	"github.com/mlange-42/arche/ecs/event"
-	"github.com/mlange-42/arche/generic"
-	"github.com/mlange-42/arche/listener"
-)
-
-// will be added as  an ecs.Resource to the world so we  can use it in
-// CollisionSystem to dynamically make it appear or disappear
-type ParticleObserver struct {
-	// we only have one particle so far, if we use multiple ones, turn
-	// this in to a map, see player_observer.go for an example
-	Entity ecs.Entity
-}
-
-// Create a  new resource of  type PlayerObserver which will  hold all
-// player  entities.   We   also  add  a  Listener   which  looks  for
-// EntityRemoved events and  if a player gets removed,  we also remove
-// it from the Entity map in our observer.
-func NewParticleObserver(world *ecs.World) {
-	observer := &ParticleObserver{}
-
-	resmanger := generic.NewResource[ParticleObserver](world)
-	resmanger.Add(observer)
-
-	listen := listener.NewCallback(
-		func(world *ecs.World, event ecs.EntityEvent) {
-			observerID := ecs.ResourceID[ParticleObserver](world)
-			observer := world.Resources().Get(observerID).(*ParticleObserver)
-			observer.RemoveEntity(event.Entity)
-		},
-
-		event.EntityRemoved,
-	)
-
-	world.SetListener(&listen)
-}
-
-func GetParticleObserver(world *ecs.World) *ParticleObserver {
-	observerID := ecs.ResourceID[ParticleObserver](world)
-	observer := world.Resources().Get(observerID).(*ParticleObserver)
-	return observer
-}
-
-func (observer *ParticleObserver) AddEntity(entity ecs.Entity) {
-	observer.Entity = entity
-}
-
-func (observer *ParticleObserver) RemoveEntity(entity ecs.Entity) {
-	observer.Entity = ecs.Entity{}
-}

observers/player_observer.go

@@ -1,56 +0,0 @@
-package observers
-
-import (
-	"github.com/mlange-42/arche/ecs"
-	"github.com/mlange-42/arche/ecs/event"
-	"github.com/mlange-42/arche/generic"
-	"github.com/mlange-42/arche/listener"
-)
-
-// will be added as  an ecs.Resource to the world so we  can use it in
-// CollisionSystem  to check  for  player collisions.
-type PlayerObserver struct {
-	Entities map[ecs.Entity]int
-}
-
-// Create a  new resource of  type PlayerObserver which will  hold all
-// player  entities.   We   also  add  a  Listener   which  looks  for
-// EntityRemoved events and  if a player gets removed,  we also remove
-// it from the Entity map in our observer.
-func NewPlayerObserver(world *ecs.World) {
-	observer := &PlayerObserver{}
-	observer.Entities = make(map[ecs.Entity]int)
-
-	resmanger := generic.NewResource[PlayerObserver](world)
-	resmanger.Add(observer)
-
-	listen := listener.NewCallback(
-		func(world *ecs.World, event ecs.EntityEvent) {
-			observerID := ecs.ResourceID[PlayerObserver](world)
-			observer := world.Resources().Get(observerID).(*PlayerObserver)
-			observer.RemoveEntity(event.Entity)
-		},
-
-		event.EntityRemoved,
-	)
-
-	world.SetListener(&listen)
-}
-
-func GetPlayerObserver(world *ecs.World) *PlayerObserver {
-	observerID := ecs.ResourceID[PlayerObserver](world)
-	observer := world.Resources().Get(observerID).(*PlayerObserver)
-	return observer
-}
-
-func (observer *PlayerObserver) AddEntity(entity ecs.Entity) {
-	observer.Entities[entity] = 1
-}
-
-func (observer *PlayerObserver) RemoveEntity(entity ecs.Entity) {
-	delete(observer.Entities, entity)
-}
-
-func (observer *PlayerObserver) RemoveEntities() {
-	observer.Entities = make(map[ecs.Entity]int)
-}