Noah Petherbridge
4851730ccf
Levels can now be converted to RLE encoded chunk accessors and be re-saved
continuously without any loss of information.
Off-by-one errors resolved:
* The rle.NewGrid() was adding a +1 everywhere making the 2D grids have 129
elements to a side for a 128 chunk size.
* In rle.Decompress() the cursor value and translation to X,Y coordinates is
fixed to avoid a pixel going missing at the end of the first row (128,0)
* The abs.X-- hack in UnmarshalBinary is no longer needed to prevent the
chunks from scooting a pixel to the right on every save.
Doodad tool updates:
* Remove unused CLI flags in `doodad resave` (actors, chunks, script,
attachment, verbose) and add a `--output` flag to save to a different file
name to the original.
* Update `doodad show` to allow debugging of RLE compressed chunks:
* CLI flag `--chunk=1,2` to specify a single chunk coordinate to debug
* CLI flag `--visualize-rle` will Visualize() RLE compressed chunks in
their 2D grid form in your terminal window (VERY noisy for large
levels! Use the --chunk option to narrow to one chunk).
Bug fixes and misc changes:
* Chunk.Usage() to return a better percentage of chunk utilization.
* Chunker.ChunkFromZipfile() was split out into two functions:
* RawChunkFromZipfile retrieves the raw bytes of the chunk as well as the
file extension discovered (.bin or .json) so the caller can interpret
the bytes correctly.
* ChunkFromZipfile calls the former function and then depending on file
extension, unmarshals from binary or json.
* The Raw function enables the `doodad show` command to debug and visualize
the raw contents of the RLE compressed chunks.
* Updated the Visualize() function for the RLE encoder: instead of converting
palette indexes to hex (0-F) which would begin causing problems for palette
indexes above 16 (as they would use two+ characters), indexes are mapped to
a wider range of symbols (0-9A-Z) and roll over if you have more than 36
colors on your level. This at least keeps the Visualize() grid an easy to
read 128x128 characters in your terminal.
110 lines
2.7 KiB
Go
110 lines
2.7 KiB
Go
package commands
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"git.kirsle.net/SketchyMaze/doodle/pkg/doodads"
|
|
"git.kirsle.net/SketchyMaze/doodle/pkg/enum"
|
|
"git.kirsle.net/SketchyMaze/doodle/pkg/level"
|
|
"git.kirsle.net/SketchyMaze/doodle/pkg/log"
|
|
"github.com/urfave/cli/v2"
|
|
)
|
|
|
|
// Resave a Level or Doodad to adapt to file format upgrades.
|
|
var Resave *cli.Command
|
|
|
|
func init() {
|
|
Resave = &cli.Command{
|
|
Name: "resave",
|
|
Usage: "load and re-save a level or doodad file to migrate to newer file format versions",
|
|
ArgsUsage: "<.level or .doodad>",
|
|
Flags: []cli.Flag{
|
|
&cli.StringFlag{
|
|
Name: "output",
|
|
Aliases: []string{"o"},
|
|
Usage: "write to a different file than the input",
|
|
},
|
|
},
|
|
Action: func(c *cli.Context) error {
|
|
if c.NArg() < 1 {
|
|
return cli.Exit(
|
|
"Usage: doodad resave <.level .doodad ...>",
|
|
1,
|
|
)
|
|
}
|
|
|
|
filenames := c.Args().Slice()
|
|
for _, filename := range filenames {
|
|
switch strings.ToLower(filepath.Ext(filename)) {
|
|
case enum.LevelExt:
|
|
if err := resaveLevel(c, filename); err != nil {
|
|
log.Error(err.Error())
|
|
return cli.Exit("Error", 1)
|
|
}
|
|
case enum.DoodadExt:
|
|
if err := resaveDoodad(c, filename); err != nil {
|
|
log.Error(err.Error())
|
|
return cli.Exit("Error", 1)
|
|
}
|
|
default:
|
|
log.Error("File %s: not a level or doodad", filename)
|
|
}
|
|
}
|
|
return nil
|
|
},
|
|
}
|
|
}
|
|
|
|
// resaveLevel shows data about a level file.
|
|
func resaveLevel(c *cli.Context, filename string) error {
|
|
lvl, err := level.LoadJSON(filename)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
log.Info("Loaded level from file: %s", filename)
|
|
log.Info("Last saved game version: %s", lvl.GameVersion)
|
|
|
|
// Different output filename?
|
|
if output := c.String("output"); output != "" {
|
|
log.Info("Output will be saved to: %s", output)
|
|
filename = output
|
|
}
|
|
|
|
if err := lvl.Vacuum(); err != nil {
|
|
log.Error("Vacuum error: %s", err)
|
|
} else {
|
|
log.Info("Run vacuum on level file.")
|
|
}
|
|
|
|
log.Info("Saving back to disk")
|
|
if err := lvl.WriteJSON(filename); err != nil {
|
|
return fmt.Errorf("couldn't write %s: %s", filename, err)
|
|
}
|
|
return showLevel(c, filename)
|
|
}
|
|
|
|
func resaveDoodad(c *cli.Context, filename string) error {
|
|
dd, err := doodads.LoadJSON(filename)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
log.Info("Loaded doodad from file: %s", filename)
|
|
log.Info("Last saved game version: %s", dd.GameVersion)
|
|
|
|
// Different output filename?
|
|
if output := c.String("output"); output != "" {
|
|
log.Info("Output will be saved to: %s", output)
|
|
filename = output
|
|
}
|
|
|
|
log.Info("Saving back to disk")
|
|
if err := dd.WriteJSON(filename); err != nil {
|
|
return fmt.Errorf("couldn't write %s: %s", filename, err)
|
|
}
|
|
return showDoodad(c, filename)
|
|
}
|