From aec32e115c7d61b952c75da5cd10c542332e482f Mon Sep 17 00:00:00 2001
From: Sebastian Morr <sebastian@morr.cc>
Date: Wed, 30 Sep 2020 22:20:42 +0200
Subject: [PATCH] Add more levels in the new format

---
 level.gd                                 | 4 +++-
 levels/top-down/{rebase/start => rebase} | 8 ++++++++
 levels/top-down/rebase/description       | 1 -
 levels/top-down/rebase/goal              | 9 ---------
 levels/top-down/rebase/win               | 1 -
 levels/top-down/sandbox                  | 8 ++++++++
 levels/top-down/sequence                 | 2 +-
 levels/top-down/welcome/description      | 1 -
 main.gd                                  | 2 +-
 repository.gd                            | 2 +-
 10 files changed, 22 insertions(+), 16 deletions(-)
 rename levels/top-down/{rebase/start => rebase} (51%)
 delete mode 100644 levels/top-down/rebase/description
 delete mode 100644 levels/top-down/rebase/goal
 delete mode 100644 levels/top-down/rebase/win
 create mode 100644 levels/top-down/sandbox
 delete mode 100644 levels/top-down/welcome/description

diff --git a/level.gd b/level.gd
index 2f5ea24..15ab2d2 100644
--- a/level.gd
+++ b/level.gd
@@ -97,10 +97,12 @@ func construct():
 
 func check_win():
 	var won = true
+	var any_checked = false
 	for r in repos:
 		var repo = repos[r]
 		if repo.win_commands != "":
+			any_checked = true
 			game.global_shell.cd(repo.path)
 			if not game.global_shell.run("function win { %s\n}; win 2>/dev/null >/dev/null && echo yes || echo no" % repo.win_commands) == "yes\n":
 				won = false
-	return won
+	return won and any_checked
diff --git a/levels/top-down/rebase/start b/levels/top-down/rebase
similarity index 51%
rename from levels/top-down/rebase/start
rename to levels/top-down/rebase
index 63c6c4b..9a46e7f 100644
--- a/levels/top-down/rebase/start
+++ b/levels/top-down/rebase
@@ -1,3 +1,7 @@
+description = Rebase all branches on top of the main branch, so that the commits are in alphabetical order, and then point the main branch to the top commit.
+
+[setup]
+
 git commit --allow-empty -m A
 git commit --allow-empty -m B
 git commit --allow-empty -m C
@@ -10,3 +14,7 @@ git switch -c side2 main~2
 git commit --allow-empty -m F
 
 git checkout main
+
+[win]
+
+diff <(git log --pretty=%s main) <(echo -e "F\nE\nD\nC\nB\nA")
diff --git a/levels/top-down/rebase/description b/levels/top-down/rebase/description
deleted file mode 100644
index 4273ffe..0000000
--- a/levels/top-down/rebase/description
+++ /dev/null
@@ -1 +0,0 @@
-Rebase all branches on top of the main branch, so that the commits are in alphabetical order, and then point the main branch to the top commit.
diff --git a/levels/top-down/rebase/goal b/levels/top-down/rebase/goal
deleted file mode 100644
index c0cbac1..0000000
--- a/levels/top-down/rebase/goal
+++ /dev/null
@@ -1,9 +0,0 @@
-git switch side1
-git rebase main
-git switch side2
-git rebase side1
-git switch main
-git merge side2
-
-git reflog expire --expire=all --all
-git prune
diff --git a/levels/top-down/rebase/win b/levels/top-down/rebase/win
deleted file mode 100644
index dfac9cb..0000000
--- a/levels/top-down/rebase/win
+++ /dev/null
@@ -1 +0,0 @@
-diff <(git log --pretty=%s main) <(echo -e "F\nE\nD\nC\nB\nA")
diff --git a/levels/top-down/sandbox b/levels/top-down/sandbox
new file mode 100644
index 0000000..c6396c5
--- /dev/null
+++ b/levels/top-down/sandbox
@@ -0,0 +1,8 @@
+[setup local]
+
+git commit --allow-empty -m "1"
+git commit --allow-empty -m "2"
+git commit --allow-empty -m "3"
+git push
+
+[setup origin]
diff --git a/levels/top-down/sequence b/levels/top-down/sequence
index 97ce6cb..b04600a 100644
--- a/levels/top-down/sequence
+++ b/levels/top-down/sequence
@@ -1 +1 @@
-welcome
+sandbox
diff --git a/levels/top-down/welcome/description b/levels/top-down/welcome/description
deleted file mode 100644
index 5a6f52f..0000000
--- a/levels/top-down/welcome/description
+++ /dev/null
@@ -1 +0,0 @@
-Hiiii!
diff --git a/main.gd b/main.gd
index 433d90e..6c4a592 100644
--- a/main.gd
+++ b/main.gd
@@ -40,7 +40,7 @@ func _ready():
 	chapter_select.select(0)
 	
 	# Load first chapter.
-	load_chapter(0)
+	load_chapter(1)
 	input.grab_focus()
 
 func load_chapter(id):
diff --git a/repository.gd b/repository.gd
index 30e99fe..777abb6 100644
--- a/repository.gd
+++ b/repository.gd
@@ -155,7 +155,7 @@ func apply_forces():
 		var center_of_gravity = nodes.rect_size/2
 		var d = o.position.distance_to(center_of_gravity)
 		var dir = (o.position - center_of_gravity).normalized()
-		var f = (d+0.00001)*Vector2(0.03, 0.01)
+		var f = (d+0.00001)*(Vector2(nodes.rect_size.y, nodes.rect_size.x).normalized()/30)
 		o.position -= dir*f
 	
 func find_position(n):