From 154fc6c9cbd75f49600b9e82fb1d94c4e61a103b Mon Sep 17 00:00:00 2001
From: Noah Petherbridge <root@kirsle.net>
Date: Sat, 6 Jul 2019 23:50:38 -0700
Subject: [PATCH] Update Doodad build-scripts to tag extra data

* The Blue Azulian marks its doodad file as Hidden.
* All Doodads are write locked after generation and tagged with common
  author value.
---
 cmd/doodad/commands/edit_doodad.go    | 10 +++++++++-
 cmd/doodad/commands/edit_level.go     |  8 ++++++++
 dev-assets/doodads/azulian/azulian.js |  2 --
 dev-assets/doodads/build.sh           |  2 ++
 pkg/doodads/fmt_readwrite.go          |  2 +-
 pkg/play_scene.go                     |  7 ++++++-
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/cmd/doodad/commands/edit_doodad.go b/cmd/doodad/commands/edit_doodad.go
index ddb5a1b..d1a0bf1 100644
--- a/cmd/doodad/commands/edit_doodad.go
+++ b/cmd/doodad/commands/edit_doodad.go
@@ -17,6 +17,10 @@ func init() {
 		Usage:     "update metadata for a Doodad file",
 		ArgsUsage: "<filename.doodad>",
 		Flags: []cli.Flag{
+			cli.BoolFlag{
+				Name:  "quiet, q",
+				Usage: "limit output (don't show doodad data at the end)",
+			},
 			cli.StringFlag{
 				Name:  "title",
 				Usage: "set the doodad title",
@@ -70,7 +74,7 @@ func editDoodad(c *cli.Context, filename string) error {
 		return fmt.Errorf("Failed to load %s: %s", filename, err)
 	}
 
-	log.Info("File: %s", filename)
+	log.Info("Edit Doodad: %s", filename)
 
 	/***************************
 	* Update level properties *
@@ -120,5 +124,9 @@ func editDoodad(c *cli.Context, filename string) error {
 		log.Warn("Note: No changes made to level")
 	}
 
+	if c.Bool("quiet") {
+		return nil
+	}
+
 	return showDoodad(c, filename)
 }
diff --git a/cmd/doodad/commands/edit_level.go b/cmd/doodad/commands/edit_level.go
index 51da1fe..6eaffae 100644
--- a/cmd/doodad/commands/edit_level.go
+++ b/cmd/doodad/commands/edit_level.go
@@ -18,6 +18,10 @@ func init() {
 		Usage:     "update metadata for a Level file",
 		ArgsUsage: "<filename.level>",
 		Flags: []cli.Flag{
+			cli.BoolFlag{
+				Name:  "quiet, q",
+				Usage: "limit output (don't show doodad data at the end)",
+			},
 			cli.StringFlag{
 				Name:  "title",
 				Usage: "set the level title",
@@ -152,5 +156,9 @@ func editLevel(c *cli.Context, filename string) error {
 		log.Warn("Note: No changes made to level")
 	}
 
+	if c.Bool("quiet") {
+		return nil
+	}
+
 	return showLevel(c, filename)
 }
diff --git a/dev-assets/doodads/azulian/azulian.js b/dev-assets/doodads/azulian/azulian.js
index 8636700..8a335d1 100644
--- a/dev-assets/doodads/azulian/azulian.js
+++ b/dev-assets/doodads/azulian/azulian.js
@@ -1,6 +1,4 @@
 function main() {
-	Flash("Azulian '%s' initialized!", Self.Doodad.Title);
-
 	var playerSpeed = 12;
 	var gravity = 4;
 	var Vx = Vy = 0;
diff --git a/dev-assets/doodads/build.sh b/dev-assets/doodads/build.sh
index 97ce263..3985e5a 100755
--- a/dev-assets/doodads/build.sh
+++ b/dev-assets/doodads/build.sh
@@ -98,6 +98,7 @@ azulians() {
 
 	doodad convert -t "Blue Azulian" blu-front.png blu-back.png \
 		blu-wr{1,2,3,4}.png blu-wl{1,2,3,4}.png azu-blu.doodad
+	doodad edit-doodad -hide azu-blu.doodad
 	doodad install-script azulian.js azu-blu.doodad
 
 	doodad convert -t "Red Azulian" red-front.png red-back.png \
@@ -126,3 +127,4 @@ doors
 trapdoors
 azulians
 objects
+doodad edit-doodad -quiet -lock -author "Noah" ../../assets/doodads/*.doodad
diff --git a/pkg/doodads/fmt_readwrite.go b/pkg/doodads/fmt_readwrite.go
index 6406e7f..4d13bdb 100644
--- a/pkg/doodads/fmt_readwrite.go
+++ b/pkg/doodads/fmt_readwrite.go
@@ -126,7 +126,7 @@ func (d *Doodad) WriteFile(filename string) error {
 
 	// Desktop: write to disk.
 	filename = userdir.DoodadPath(filename)
-	log.Info("Write Doodad: %s", filename)
+	log.Debug("Write Doodad: %s", filename)
 	err = ioutil.WriteFile(filename, bin, 0644)
 	if err != nil {
 		return fmt.Errorf("doodads.WriteFile: %s", err)
diff --git a/pkg/play_scene.go b/pkg/play_scene.go
index ed3e8e2..22033da 100644
--- a/pkg/play_scene.go
+++ b/pkg/play_scene.go
@@ -175,7 +175,12 @@ func (s *PlayScene) Setup(d *Doodle) error {
 		log.Error("PlayScene.Setup: failed to drawing.InstallScripts: %s", err)
 	}
 
-	d.Flash("Entered Play Mode. Press 'E' to edit this map.")
+	if s.CanEdit {
+		d.Flash("Entered Play Mode. Press 'E' to edit this map.")
+	} else {
+		d.Flash("%s", s.Level.Title)
+	}
+
 	s.running = true
 
 	return nil