From f742085fd19981d7ea77b24c3056e19ad02ad8c9 Mon Sep 17 00:00:00 2001
From: blinry <sebastian@morr.cc>
Date: Fri, 13 Nov 2020 11:21:36 +0100
Subject: [PATCH] Add a "create files" level

---
 levels/time-machine/files-add | 23 +++++++++++++++++++++++
 resources/cards.json          |  5 +++++
 scenes/file_browser.tscn      |  6 +++---
 scenes/repository.gd          |  6 +++---
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 levels/time-machine/files-add

diff --git a/levels/time-machine/files-add b/levels/time-machine/files-add
new file mode 100644
index 0000000..0438472
--- /dev/null
+++ b/levels/time-machine/files-add
@@ -0,0 +1,23 @@
+title = Interior design
+cards = checkout commit-auto reset-hard file-new file-delete
+
+[description]
+
+Our client want some new furniture! You'll discover that they have a very special taste - please add some more furniture that matches this style and make a commit!
+
+[setup]
+
+echo A yellow cupboard with lots of drawers. > cupboard
+echo A really big yellow shelf. > shelf
+git add .
+git commit -m "A cupboard and a shelf"
+
+[win]
+
+NUM_FILES="$(git ls-tree --name-only -r HEAD | wc -l)"
+YELLOW_FILES="$(git grep -l yellow HEAD | wc -l)"
+test "$NUM_FILES" -ge 5 && test "$YELLOW_FILES" = "$NUM_FILES"
+
+[congrats]
+
+Thanks! Our clients says that they really like what you picked!
diff --git a/resources/cards.json b/resources/cards.json
index f458136..05d4c1a 100644
--- a/resources/cards.json
+++ b/resources/cards.json
@@ -98,5 +98,10 @@
 		"id": "file-new",
 		"command": "touch [string]",
 		"description": "Create a new file."
+	},
+	{
+		"id": "file-delete",
+		"command": "rm [file]",
+		"description": "Delete a new file."
 	}
 ]
diff --git a/scenes/file_browser.tscn b/scenes/file_browser.tscn
index 90f1056..844953d 100644
--- a/scenes/file_browser.tscn
+++ b/scenes/file_browser.tscn
@@ -46,7 +46,7 @@ __meta__ = {
 
 [node name="Title" type="Label" parent="Panel/Margin/Rows"]
 margin_right = 1904.0
-margin_bottom = 32.0
+margin_bottom = 29.0
 text = "title"
 align = 1
 
@@ -69,7 +69,7 @@ margin_bottom = 50.0
 text = "dir"
 
 [node name="Scroll" type="ScrollContainer" parent="Panel/Margin/Rows"]
-margin_top = 32.0
+margin_top = 29.0
 margin_right = 1904.0
 margin_bottom = 1064.0
 size_flags_horizontal = 3
@@ -77,7 +77,7 @@ size_flags_vertical = 3
 
 [node name="Grid" type="GridContainer" parent="Panel/Margin/Rows/Scroll"]
 margin_right = 1904.0
-margin_bottom = 1032.0
+margin_bottom = 1035.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/vseparation = 16
diff --git a/scenes/repository.gd b/scenes/repository.gd
index 9b2b637..8222a3b 100644
--- a/scenes/repository.gd
+++ b/scenes/repository.gd
@@ -7,7 +7,7 @@ onready var simplify_checkbox = $Rows/RepoVis/SimplifyCheckbox
 
 export var label: String setget set_label
 export var path: String setget set_path, get_path
-export var simplified_view = false setget set_simplified_view
+export var simplified_view = true setget set_simplified_view
 export var editable_path = false setget set_editable_path
 
 var node = preload("res://scenes/node.tscn")
@@ -109,8 +109,8 @@ func update_objects():
 				n.children = c
 				
 				_commit_count += 1
-				if _commit_count >= 3 and not simplified_view:
-					set_simplified_view(true)
+#				if _commit_count >= 3 and not simplified_view:
+#					set_simplified_view(true)
 			"tag":
 				n.children = tag_target(o)