diff --git a/levels/en/bisect/bisect b/levels/bisect/en/bisect similarity index 100% rename from levels/en/bisect/bisect rename to levels/bisect/en/bisect diff --git a/levels/it/bisect/bisect b/levels/bisect/it/bisect similarity index 100% rename from levels/it/bisect/bisect rename to levels/bisect/it/bisect diff --git a/levels/en/bisect/sequence b/levels/bisect/sequence similarity index 100% rename from levels/en/bisect/sequence rename to levels/bisect/sequence diff --git a/levels/en/branches/branch-create b/levels/branches/en/branch-create similarity index 100% rename from levels/en/branches/branch-create rename to levels/branches/en/branch-create diff --git a/levels/en/branches/branch-remove b/levels/branches/en/branch-remove similarity index 100% rename from levels/en/branches/branch-remove rename to levels/branches/en/branch-remove diff --git a/levels/en/branches/checkout-commit b/levels/branches/en/checkout-commit similarity index 100% rename from levels/en/branches/checkout-commit rename to levels/branches/en/checkout-commit diff --git a/levels/en/branches/fork b/levels/branches/en/fork similarity index 100% rename from levels/en/branches/fork rename to levels/branches/en/fork diff --git a/levels/en/branches/grow b/levels/branches/en/grow similarity index 100% rename from levels/en/branches/grow rename to levels/branches/en/grow diff --git a/levels/en/branches/reorder b/levels/branches/en/reorder similarity index 100% rename from levels/en/branches/reorder rename to levels/branches/en/reorder diff --git a/levels/it/branches/branch-create b/levels/branches/it/branch-create similarity index 100% rename from levels/it/branches/branch-create rename to levels/branches/it/branch-create diff --git a/levels/it/branches/branch-remove b/levels/branches/it/branch-remove similarity index 100% rename from levels/it/branches/branch-remove rename to levels/branches/it/branch-remove diff --git a/levels/it/branches/checkout-commit b/levels/branches/it/checkout-commit similarity index 100% rename from levels/it/branches/checkout-commit rename to levels/branches/it/checkout-commit diff --git a/levels/it/branches/fork b/levels/branches/it/fork similarity index 100% rename from levels/it/branches/fork rename to levels/branches/it/fork diff --git a/levels/it/branches/grow b/levels/branches/it/grow similarity index 100% rename from levels/it/branches/grow rename to levels/branches/it/grow diff --git a/levels/it/branches/reorder b/levels/branches/it/reorder similarity index 100% rename from levels/it/branches/reorder rename to levels/branches/it/reorder diff --git a/levels/en/branches/sequence b/levels/branches/sequence similarity index 100% rename from levels/en/branches/sequence rename to levels/branches/sequence diff --git a/levels/en/changing-the-past/rebase b/levels/changing-the-past/en/rebase similarity index 100% rename from levels/en/changing-the-past/rebase rename to levels/changing-the-past/en/rebase diff --git a/levels/en/changing-the-past/reorder b/levels/changing-the-past/en/reorder similarity index 100% rename from levels/en/changing-the-past/reorder rename to levels/changing-the-past/en/reorder diff --git a/levels/it/changing-the-past/rebase b/levels/changing-the-past/it/rebase similarity index 100% rename from levels/it/changing-the-past/rebase rename to levels/changing-the-past/it/rebase diff --git a/levels/it/changing-the-past/reorder b/levels/changing-the-past/it/reorder similarity index 100% rename from levels/it/changing-the-past/reorder rename to levels/changing-the-past/it/reorder diff --git a/levels/en/changing-the-past/sequence b/levels/changing-the-past/sequence similarity index 100% rename from levels/en/changing-the-past/sequence rename to levels/changing-the-past/sequence diff --git a/levels/en/files/files-add b/levels/files/en/files-add similarity index 100% rename from levels/en/files/files-add rename to levels/files/en/files-add diff --git a/levels/en/files/files-delete b/levels/files/en/files-delete similarity index 100% rename from levels/en/files/files-delete rename to levels/files/en/files-delete diff --git a/levels/it/files/files-add b/levels/files/it/files-add similarity index 100% rename from levels/it/files/files-add rename to levels/files/it/files-add diff --git a/levels/it/files/files-delete b/levels/files/it/files-delete similarity index 100% rename from levels/it/files/files-delete rename to levels/files/it/files-delete diff --git a/levels/en/files/sequence b/levels/files/sequence similarity index 100% rename from levels/en/files/sequence rename to levels/files/sequence diff --git a/levels/en/index/add b/levels/index/en/add similarity index 100% rename from levels/en/index/add rename to levels/index/en/add diff --git a/levels/en/index/change b/levels/index/en/change similarity index 100% rename from levels/en/index/change rename to levels/index/en/change diff --git a/levels/en/index/checkout b/levels/index/en/checkout similarity index 100% rename from levels/en/index/checkout rename to levels/index/en/checkout diff --git a/levels/en/index/compare b/levels/index/en/compare similarity index 100% rename from levels/en/index/compare rename to levels/index/en/compare diff --git a/levels/en/index/new b/levels/index/en/new similarity index 100% rename from levels/en/index/new rename to levels/index/en/new diff --git a/levels/en/index/reset b/levels/index/en/reset similarity index 100% rename from levels/en/index/reset rename to levels/index/en/reset diff --git a/levels/en/index/rm b/levels/index/en/rm similarity index 100% rename from levels/en/index/rm rename to levels/index/en/rm diff --git a/levels/en/index/steps b/levels/index/en/steps similarity index 100% rename from levels/en/index/steps rename to levels/index/en/steps diff --git a/levels/it/index/add b/levels/index/it/add similarity index 100% rename from levels/it/index/add rename to levels/index/it/add diff --git a/levels/it/index/change b/levels/index/it/change similarity index 100% rename from levels/it/index/change rename to levels/index/it/change diff --git a/levels/it/index/checkout b/levels/index/it/checkout similarity index 100% rename from levels/it/index/checkout rename to levels/index/it/checkout diff --git a/levels/it/index/compare b/levels/index/it/compare similarity index 100% rename from levels/it/index/compare rename to levels/index/it/compare diff --git a/levels/it/index/new b/levels/index/it/new similarity index 100% rename from levels/it/index/new rename to levels/index/it/new diff --git a/levels/it/index/reset b/levels/index/it/reset similarity index 100% rename from levels/it/index/reset rename to levels/index/it/reset diff --git a/levels/it/index/rm b/levels/index/it/rm similarity index 100% rename from levels/it/index/rm rename to levels/index/it/rm diff --git a/levels/it/index/steps b/levels/index/it/steps similarity index 100% rename from levels/it/index/steps rename to levels/index/it/steps diff --git a/levels/en/index/sequence b/levels/index/sequence similarity index 100% rename from levels/en/index/sequence rename to levels/index/sequence diff --git a/levels/en/intro/cli b/levels/intro/en/cli similarity index 100% rename from levels/en/intro/cli rename to levels/intro/en/cli diff --git a/levels/en/intro/commit b/levels/intro/en/commit similarity index 100% rename from levels/en/intro/commit rename to levels/intro/en/commit diff --git a/levels/en/intro/copies b/levels/intro/en/copies similarity index 100% rename from levels/en/intro/copies rename to levels/intro/en/copies diff --git a/levels/en/intro/init b/levels/intro/en/init similarity index 100% rename from levels/en/intro/init rename to levels/intro/en/init diff --git a/levels/en/intro/remote b/levels/intro/en/remote similarity index 100% rename from levels/en/intro/remote rename to levels/intro/en/remote diff --git a/levels/en/intro/risky b/levels/intro/en/risky similarity index 100% rename from levels/en/intro/risky rename to levels/intro/en/risky diff --git a/levels/en/intro/who-are-you b/levels/intro/en/who-are-you similarity index 100% rename from levels/en/intro/who-are-you rename to levels/intro/en/who-are-you diff --git a/levels/it/intro/cli b/levels/intro/it/cli similarity index 100% rename from levels/it/intro/cli rename to levels/intro/it/cli diff --git a/levels/it/intro/commit b/levels/intro/it/commit similarity index 100% rename from levels/it/intro/commit rename to levels/intro/it/commit diff --git a/levels/it/intro/copies b/levels/intro/it/copies similarity index 100% rename from levels/it/intro/copies rename to levels/intro/it/copies diff --git a/levels/it/intro/init b/levels/intro/it/init similarity index 100% rename from levels/it/intro/init rename to levels/intro/it/init diff --git a/levels/it/intro/remote b/levels/intro/it/remote similarity index 100% rename from levels/it/intro/remote rename to levels/intro/it/remote diff --git a/levels/it/intro/risky b/levels/intro/it/risky similarity index 100% rename from levels/it/intro/risky rename to levels/intro/it/risky diff --git a/levels/it/intro/who-are-you b/levels/intro/it/who-are-you similarity index 100% rename from levels/it/intro/who-are-you rename to levels/intro/it/who-are-you diff --git a/levels/en/intro/sequence b/levels/intro/sequence similarity index 100% rename from levels/en/intro/sequence rename to levels/intro/sequence diff --git a/levels/it/bisect/sequence b/levels/it/bisect/sequence deleted file mode 100644 index e8018fe..0000000 --- a/levels/it/bisect/sequence +++ /dev/null @@ -1 +0,0 @@ -bisect diff --git a/levels/it/branches/sequence b/levels/it/branches/sequence deleted file mode 100644 index 2619ea0..0000000 --- a/levels/it/branches/sequence +++ /dev/null @@ -1,6 +0,0 @@ -checkout-commit -fork -branch-create -grow -branch-remove -reorder diff --git a/levels/it/changing-the-past/sequence b/levels/it/changing-the-past/sequence deleted file mode 100644 index 43c5d08..0000000 --- a/levels/it/changing-the-past/sequence +++ /dev/null @@ -1,2 +0,0 @@ -rebase -reorder diff --git a/levels/it/files/sequence b/levels/it/files/sequence deleted file mode 100644 index cb24408..0000000 --- a/levels/it/files/sequence +++ /dev/null @@ -1,3 +0,0 @@ -files-delete -files-add - diff --git a/levels/it/index/#sequence# b/levels/it/index/#sequence# deleted file mode 100644 index 42f7f48..0000000 --- a/levels/it/index/#sequence# +++ /dev/null @@ -1,5 +0,0 @@ -compare -new -change -reset -steps diff --git a/levels/it/index/sequence b/levels/it/index/sequence deleted file mode 100644 index 42f7f48..0000000 --- a/levels/it/index/sequence +++ /dev/null @@ -1,5 +0,0 @@ -compare -new -change -reset -steps diff --git a/levels/it/intro/sequence b/levels/it/intro/sequence deleted file mode 100644 index aa225df..0000000 --- a/levels/it/intro/sequence +++ /dev/null @@ -1,6 +0,0 @@ -risky -copies -init -cli -commit -remote diff --git a/levels/it/low-level/sequence b/levels/it/low-level/sequence deleted file mode 100644 index 5feb0c8..0000000 --- a/levels/it/low-level/sequence +++ /dev/null @@ -1,18 +0,0 @@ -welcome -basics -blob-create -blob-remove -index-add -index-remove -index-update -tree-create -tree-read -tree-nested -commit-create -commit-parents -commit-rhombus -ref-create -ref-move -ref-remove -symref-create -symref-no-deref diff --git a/levels/it/merge/sequence b/levels/it/merge/sequence deleted file mode 100644 index 2e1aa81..0000000 --- a/levels/it/merge/sequence +++ /dev/null @@ -1,3 +0,0 @@ -merge -conflict -merge-abort \ No newline at end of file diff --git a/levels/it/remotes/sequence b/levels/it/remotes/sequence deleted file mode 100644 index 13c5715..0000000 --- a/levels/it/remotes/sequence +++ /dev/null @@ -1,2 +0,0 @@ -friend -problems diff --git a/levels/it/sandbox/sequence b/levels/it/sandbox/sequence deleted file mode 100644 index 29aa91f..0000000 --- a/levels/it/sandbox/sequence +++ /dev/null @@ -1,3 +0,0 @@ -empty -remote -three-commits diff --git a/levels/it/sequence b/levels/it/sequence deleted file mode 100644 index cefcd7a..0000000 --- a/levels/it/sequence +++ /dev/null @@ -1,13 +0,0 @@ -intro -files -branches -merge -index -remotes -changing-the-past -shit-happens -workflows -bisect -stash -tags -sandbox diff --git a/levels/it/shit-happens/sequence b/levels/it/shit-happens/sequence deleted file mode 100644 index 663d5d9..0000000 --- a/levels/it/shit-happens/sequence +++ /dev/null @@ -1,5 +0,0 @@ -restore-a-file -restore-a-file-from-the-past -bad-commit -pushed-something-broken -reflog diff --git a/levels/it/stash/sequence b/levels/it/stash/sequence deleted file mode 100644 index 9dd02f7..0000000 --- a/levels/it/stash/sequence +++ /dev/null @@ -1,5 +0,0 @@ -stash -stash-pop -stash-clear -stash-branch -stash-merge diff --git a/levels/it/tags/sequence b/levels/it/tags/sequence deleted file mode 100644 index fd63d9c..0000000 --- a/levels/it/tags/sequence +++ /dev/null @@ -1,4 +0,0 @@ -add-tag -remove-tag -add-tag-later -remote-tag diff --git a/levels/it/workflows/sequence b/levels/it/workflows/sequence deleted file mode 100644 index 1be11a8..0000000 --- a/levels/it/workflows/sequence +++ /dev/null @@ -1 +0,0 @@ -pr diff --git a/levels/en/low-level/basics b/levels/low-level/en/basics similarity index 100% rename from levels/en/low-level/basics rename to levels/low-level/en/basics diff --git a/levels/en/low-level/blob-create b/levels/low-level/en/blob-create similarity index 100% rename from levels/en/low-level/blob-create rename to levels/low-level/en/blob-create diff --git a/levels/en/low-level/blob-remove b/levels/low-level/en/blob-remove similarity index 100% rename from levels/en/low-level/blob-remove rename to levels/low-level/en/blob-remove diff --git a/levels/en/low-level/commit-create b/levels/low-level/en/commit-create similarity index 100% rename from levels/en/low-level/commit-create rename to levels/low-level/en/commit-create diff --git a/levels/en/low-level/commit-parents b/levels/low-level/en/commit-parents similarity index 100% rename from levels/en/low-level/commit-parents rename to levels/low-level/en/commit-parents diff --git a/levels/en/low-level/commit-rhombus b/levels/low-level/en/commit-rhombus similarity index 100% rename from levels/en/low-level/commit-rhombus rename to levels/low-level/en/commit-rhombus diff --git a/levels/en/low-level/index-add b/levels/low-level/en/index-add similarity index 100% rename from levels/en/low-level/index-add rename to levels/low-level/en/index-add diff --git a/levels/en/low-level/index-remove b/levels/low-level/en/index-remove similarity index 100% rename from levels/en/low-level/index-remove rename to levels/low-level/en/index-remove diff --git a/levels/en/low-level/index-update b/levels/low-level/en/index-update similarity index 100% rename from levels/en/low-level/index-update rename to levels/low-level/en/index-update diff --git a/levels/en/low-level/puzzle-apocalypse b/levels/low-level/en/puzzle-apocalypse similarity index 100% rename from levels/en/low-level/puzzle-apocalypse rename to levels/low-level/en/puzzle-apocalypse diff --git a/levels/en/low-level/puzzle-precious-blob b/levels/low-level/en/puzzle-precious-blob similarity index 100% rename from levels/en/low-level/puzzle-precious-blob rename to levels/low-level/en/puzzle-precious-blob diff --git a/levels/en/low-level/puzzle-trees-all-the-way-down b/levels/low-level/en/puzzle-trees-all-the-way-down similarity index 100% rename from levels/en/low-level/puzzle-trees-all-the-way-down rename to levels/low-level/en/puzzle-trees-all-the-way-down diff --git a/levels/en/low-level/ref-create b/levels/low-level/en/ref-create similarity index 100% rename from levels/en/low-level/ref-create rename to levels/low-level/en/ref-create diff --git a/levels/en/low-level/ref-move b/levels/low-level/en/ref-move similarity index 100% rename from levels/en/low-level/ref-move rename to levels/low-level/en/ref-move diff --git a/levels/en/low-level/ref-remove b/levels/low-level/en/ref-remove similarity index 100% rename from levels/en/low-level/ref-remove rename to levels/low-level/en/ref-remove diff --git a/levels/en/low-level/symref-create b/levels/low-level/en/symref-create similarity index 100% rename from levels/en/low-level/symref-create rename to levels/low-level/en/symref-create diff --git a/levels/en/low-level/symref-no-deref b/levels/low-level/en/symref-no-deref similarity index 100% rename from levels/en/low-level/symref-no-deref rename to levels/low-level/en/symref-no-deref diff --git a/levels/en/low-level/tree-create b/levels/low-level/en/tree-create similarity index 100% rename from levels/en/low-level/tree-create rename to levels/low-level/en/tree-create diff --git a/levels/en/low-level/tree-nested b/levels/low-level/en/tree-nested similarity index 100% rename from levels/en/low-level/tree-nested rename to levels/low-level/en/tree-nested diff --git a/levels/en/low-level/tree-read b/levels/low-level/en/tree-read similarity index 100% rename from levels/en/low-level/tree-read rename to levels/low-level/en/tree-read diff --git a/levels/en/low-level/welcome b/levels/low-level/en/welcome similarity index 100% rename from levels/en/low-level/welcome rename to levels/low-level/en/welcome diff --git a/levels/it/low-level/basics b/levels/low-level/it/basics similarity index 100% rename from levels/it/low-level/basics rename to levels/low-level/it/basics diff --git a/levels/it/low-level/blob-create b/levels/low-level/it/blob-create similarity index 100% rename from levels/it/low-level/blob-create rename to levels/low-level/it/blob-create diff --git a/levels/it/low-level/blob-remove b/levels/low-level/it/blob-remove similarity index 100% rename from levels/it/low-level/blob-remove rename to levels/low-level/it/blob-remove diff --git a/levels/it/low-level/commit-create b/levels/low-level/it/commit-create similarity index 100% rename from levels/it/low-level/commit-create rename to levels/low-level/it/commit-create diff --git a/levels/it/low-level/commit-parents b/levels/low-level/it/commit-parents similarity index 100% rename from levels/it/low-level/commit-parents rename to levels/low-level/it/commit-parents diff --git a/levels/it/low-level/commit-rhombus b/levels/low-level/it/commit-rhombus similarity index 100% rename from levels/it/low-level/commit-rhombus rename to levels/low-level/it/commit-rhombus diff --git a/levels/it/low-level/index-add b/levels/low-level/it/index-add similarity index 100% rename from levels/it/low-level/index-add rename to levels/low-level/it/index-add diff --git a/levels/it/low-level/index-remove b/levels/low-level/it/index-remove similarity index 100% rename from levels/it/low-level/index-remove rename to levels/low-level/it/index-remove diff --git a/levels/it/low-level/index-update b/levels/low-level/it/index-update similarity index 100% rename from levels/it/low-level/index-update rename to levels/low-level/it/index-update diff --git a/levels/it/low-level/puzzle-apocalypse b/levels/low-level/it/puzzle-apocalypse similarity index 100% rename from levels/it/low-level/puzzle-apocalypse rename to levels/low-level/it/puzzle-apocalypse diff --git a/levels/it/low-level/puzzle-precious-blob b/levels/low-level/it/puzzle-precious-blob similarity index 100% rename from levels/it/low-level/puzzle-precious-blob rename to levels/low-level/it/puzzle-precious-blob diff --git a/levels/it/low-level/puzzle-trees-all-the-way-down b/levels/low-level/it/puzzle-trees-all-the-way-down similarity index 100% rename from levels/it/low-level/puzzle-trees-all-the-way-down rename to levels/low-level/it/puzzle-trees-all-the-way-down diff --git a/levels/it/low-level/ref-create b/levels/low-level/it/ref-create similarity index 100% rename from levels/it/low-level/ref-create rename to levels/low-level/it/ref-create diff --git a/levels/it/low-level/ref-move b/levels/low-level/it/ref-move similarity index 100% rename from levels/it/low-level/ref-move rename to levels/low-level/it/ref-move diff --git a/levels/it/low-level/ref-remove b/levels/low-level/it/ref-remove similarity index 100% rename from levels/it/low-level/ref-remove rename to levels/low-level/it/ref-remove diff --git a/levels/it/low-level/symref-create b/levels/low-level/it/symref-create similarity index 100% rename from levels/it/low-level/symref-create rename to levels/low-level/it/symref-create diff --git a/levels/it/low-level/symref-no-deref b/levels/low-level/it/symref-no-deref similarity index 100% rename from levels/it/low-level/symref-no-deref rename to levels/low-level/it/symref-no-deref diff --git a/levels/it/low-level/tree-create b/levels/low-level/it/tree-create similarity index 100% rename from levels/it/low-level/tree-create rename to levels/low-level/it/tree-create diff --git a/levels/it/low-level/tree-nested b/levels/low-level/it/tree-nested similarity index 100% rename from levels/it/low-level/tree-nested rename to levels/low-level/it/tree-nested diff --git a/levels/it/low-level/tree-read b/levels/low-level/it/tree-read similarity index 100% rename from levels/it/low-level/tree-read rename to levels/low-level/it/tree-read diff --git a/levels/it/low-level/welcome b/levels/low-level/it/welcome similarity index 100% rename from levels/it/low-level/welcome rename to levels/low-level/it/welcome diff --git a/levels/en/low-level/sequence b/levels/low-level/sequence similarity index 100% rename from levels/en/low-level/sequence rename to levels/low-level/sequence diff --git a/levels/en/merge/conflict b/levels/merge/en/conflict similarity index 100% rename from levels/en/merge/conflict rename to levels/merge/en/conflict diff --git a/levels/en/merge/merge b/levels/merge/en/merge similarity index 100% rename from levels/en/merge/merge rename to levels/merge/en/merge diff --git a/levels/en/merge/merge-abort b/levels/merge/en/merge-abort similarity index 100% rename from levels/en/merge/merge-abort rename to levels/merge/en/merge-abort diff --git a/levels/it/merge/conflict b/levels/merge/it/conflict similarity index 100% rename from levels/it/merge/conflict rename to levels/merge/it/conflict diff --git a/levels/it/merge/merge b/levels/merge/it/merge similarity index 100% rename from levels/it/merge/merge rename to levels/merge/it/merge diff --git a/levels/it/merge/merge-abort b/levels/merge/it/merge-abort similarity index 100% rename from levels/it/merge/merge-abort rename to levels/merge/it/merge-abort diff --git a/levels/en/merge/sequence b/levels/merge/sequence similarity index 100% rename from levels/en/merge/sequence rename to levels/merge/sequence diff --git a/levels/en/remotes/friend b/levels/remotes/en/friend similarity index 100% rename from levels/en/remotes/friend rename to levels/remotes/en/friend diff --git a/levels/en/remotes/problems b/levels/remotes/en/problems similarity index 100% rename from levels/en/remotes/problems rename to levels/remotes/en/problems diff --git a/levels/it/remotes/friend b/levels/remotes/it/friend similarity index 100% rename from levels/it/remotes/friend rename to levels/remotes/it/friend diff --git a/levels/it/remotes/problems b/levels/remotes/it/problems similarity index 100% rename from levels/it/remotes/problems rename to levels/remotes/it/problems diff --git a/levels/en/remotes/sequence b/levels/remotes/sequence similarity index 100% rename from levels/en/remotes/sequence rename to levels/remotes/sequence diff --git a/levels/en/sandbox/empty b/levels/sandbox/en/empty similarity index 100% rename from levels/en/sandbox/empty rename to levels/sandbox/en/empty diff --git a/levels/en/sandbox/remote b/levels/sandbox/en/remote similarity index 100% rename from levels/en/sandbox/remote rename to levels/sandbox/en/remote diff --git a/levels/en/sandbox/three-commits b/levels/sandbox/en/three-commits similarity index 100% rename from levels/en/sandbox/three-commits rename to levels/sandbox/en/three-commits diff --git a/levels/it/sandbox/empty b/levels/sandbox/it/empty similarity index 100% rename from levels/it/sandbox/empty rename to levels/sandbox/it/empty diff --git a/levels/it/sandbox/remote b/levels/sandbox/it/remote similarity index 100% rename from levels/it/sandbox/remote rename to levels/sandbox/it/remote diff --git a/levels/it/sandbox/three-commits b/levels/sandbox/it/three-commits similarity index 100% rename from levels/it/sandbox/three-commits rename to levels/sandbox/it/three-commits diff --git a/levels/en/sandbox/sequence b/levels/sandbox/sequence similarity index 100% rename from levels/en/sandbox/sequence rename to levels/sandbox/sequence diff --git a/levels/en/sequence b/levels/sequence similarity index 100% rename from levels/en/sequence rename to levels/sequence diff --git a/levels/en/shit-happens/bad-commit b/levels/shit-happens/en/bad-commit similarity index 100% rename from levels/en/shit-happens/bad-commit rename to levels/shit-happens/en/bad-commit diff --git a/levels/en/shit-happens/pushed-something-broken b/levels/shit-happens/en/pushed-something-broken similarity index 100% rename from levels/en/shit-happens/pushed-something-broken rename to levels/shit-happens/en/pushed-something-broken diff --git a/levels/en/shit-happens/reflog b/levels/shit-happens/en/reflog similarity index 100% rename from levels/en/shit-happens/reflog rename to levels/shit-happens/en/reflog diff --git a/levels/en/shit-happens/restore-a-file b/levels/shit-happens/en/restore-a-file similarity index 100% rename from levels/en/shit-happens/restore-a-file rename to levels/shit-happens/en/restore-a-file diff --git a/levels/en/shit-happens/restore-a-file-from-the-past b/levels/shit-happens/en/restore-a-file-from-the-past similarity index 100% rename from levels/en/shit-happens/restore-a-file-from-the-past rename to levels/shit-happens/en/restore-a-file-from-the-past diff --git a/levels/it/shit-happens/bad-commit b/levels/shit-happens/it/bad-commit similarity index 100% rename from levels/it/shit-happens/bad-commit rename to levels/shit-happens/it/bad-commit diff --git a/levels/it/shit-happens/pushed-something-broken b/levels/shit-happens/it/pushed-something-broken similarity index 100% rename from levels/it/shit-happens/pushed-something-broken rename to levels/shit-happens/it/pushed-something-broken diff --git a/levels/it/shit-happens/reflog b/levels/shit-happens/it/reflog similarity index 100% rename from levels/it/shit-happens/reflog rename to levels/shit-happens/it/reflog diff --git a/levels/it/shit-happens/restore-a-file b/levels/shit-happens/it/restore-a-file similarity index 100% rename from levels/it/shit-happens/restore-a-file rename to levels/shit-happens/it/restore-a-file diff --git a/levels/it/shit-happens/restore-a-file-from-the-past b/levels/shit-happens/it/restore-a-file-from-the-past similarity index 100% rename from levels/it/shit-happens/restore-a-file-from-the-past rename to levels/shit-happens/it/restore-a-file-from-the-past diff --git a/levels/en/shit-happens/sequence b/levels/shit-happens/sequence similarity index 100% rename from levels/en/shit-happens/sequence rename to levels/shit-happens/sequence diff --git a/levels/en/stash/stash b/levels/stash/en/stash similarity index 100% rename from levels/en/stash/stash rename to levels/stash/en/stash diff --git a/levels/en/stash/stash-branch b/levels/stash/en/stash-branch similarity index 100% rename from levels/en/stash/stash-branch rename to levels/stash/en/stash-branch diff --git a/levels/en/stash/stash-clear b/levels/stash/en/stash-clear similarity index 100% rename from levels/en/stash/stash-clear rename to levels/stash/en/stash-clear diff --git a/levels/en/stash/stash-merge b/levels/stash/en/stash-merge similarity index 100% rename from levels/en/stash/stash-merge rename to levels/stash/en/stash-merge diff --git a/levels/en/stash/stash-pop b/levels/stash/en/stash-pop similarity index 100% rename from levels/en/stash/stash-pop rename to levels/stash/en/stash-pop diff --git a/levels/it/stash/stash b/levels/stash/it/stash similarity index 100% rename from levels/it/stash/stash rename to levels/stash/it/stash diff --git a/levels/it/stash/stash-branch b/levels/stash/it/stash-branch similarity index 100% rename from levels/it/stash/stash-branch rename to levels/stash/it/stash-branch diff --git a/levels/it/stash/stash-clear b/levels/stash/it/stash-clear similarity index 100% rename from levels/it/stash/stash-clear rename to levels/stash/it/stash-clear diff --git a/levels/it/stash/stash-merge b/levels/stash/it/stash-merge similarity index 100% rename from levels/it/stash/stash-merge rename to levels/stash/it/stash-merge diff --git a/levels/it/stash/stash-pop b/levels/stash/it/stash-pop similarity index 100% rename from levels/it/stash/stash-pop rename to levels/stash/it/stash-pop diff --git a/levels/en/stash/sequence b/levels/stash/sequence similarity index 100% rename from levels/en/stash/sequence rename to levels/stash/sequence diff --git a/levels/en/tags/add-tag b/levels/tags/en/add-tag similarity index 100% rename from levels/en/tags/add-tag rename to levels/tags/en/add-tag diff --git a/levels/en/tags/add-tag-later b/levels/tags/en/add-tag-later similarity index 100% rename from levels/en/tags/add-tag-later rename to levels/tags/en/add-tag-later diff --git a/levels/en/tags/remote-tag b/levels/tags/en/remote-tag similarity index 100% rename from levels/en/tags/remote-tag rename to levels/tags/en/remote-tag diff --git a/levels/en/tags/remove-tag b/levels/tags/en/remove-tag similarity index 100% rename from levels/en/tags/remove-tag rename to levels/tags/en/remove-tag diff --git a/levels/it/tags/add-tag b/levels/tags/it/add-tag similarity index 100% rename from levels/it/tags/add-tag rename to levels/tags/it/add-tag diff --git a/levels/it/tags/add-tag-later b/levels/tags/it/add-tag-later similarity index 100% rename from levels/it/tags/add-tag-later rename to levels/tags/it/add-tag-later diff --git a/levels/it/tags/remote-tag b/levels/tags/it/remote-tag similarity index 100% rename from levels/it/tags/remote-tag rename to levels/tags/it/remote-tag diff --git a/levels/it/tags/remove-tag b/levels/tags/it/remove-tag similarity index 100% rename from levels/it/tags/remove-tag rename to levels/tags/it/remove-tag diff --git a/levels/en/tags/sequence b/levels/tags/sequence similarity index 100% rename from levels/en/tags/sequence rename to levels/tags/sequence diff --git a/levels/en/unused/checkout b/levels/unused/en/checkout similarity index 100% rename from levels/en/unused/checkout rename to levels/unused/en/checkout diff --git a/levels/en/unused/clone b/levels/unused/en/clone similarity index 100% rename from levels/en/unused/clone rename to levels/unused/en/clone diff --git a/levels/en/unused/commit b/levels/unused/en/commit similarity index 100% rename from levels/en/unused/commit rename to levels/unused/en/commit diff --git a/levels/en/unused/commit-a b/levels/unused/en/commit-a similarity index 100% rename from levels/en/unused/commit-a rename to levels/unused/en/commit-a diff --git a/levels/en/unused/fetch b/levels/unused/en/fetch similarity index 100% rename from levels/en/unused/fetch rename to levels/unused/en/fetch diff --git a/levels/en/unused/files-move b/levels/unused/en/files-move similarity index 100% rename from levels/en/unused/files-move rename to levels/unused/en/files-move diff --git a/levels/en/unused/index-mv b/levels/unused/en/index-mv similarity index 100% rename from levels/en/unused/index-mv rename to levels/unused/en/index-mv diff --git a/levels/en/unused/init b/levels/unused/en/init similarity index 100% rename from levels/en/unused/init rename to levels/unused/en/init diff --git a/levels/en/unused/pull-push b/levels/unused/en/pull-push similarity index 100% rename from levels/en/unused/pull-push rename to levels/unused/en/pull-push diff --git a/levels/en/unused/remotes-add b/levels/unused/en/remotes-add similarity index 100% rename from levels/en/unused/remotes-add rename to levels/unused/en/remotes-add diff --git a/levels/en/unused/remotes-delete b/levels/unused/en/remotes-delete similarity index 100% rename from levels/en/unused/remotes-delete rename to levels/unused/en/remotes-delete diff --git a/levels/en/unused/restore b/levels/unused/en/restore similarity index 100% rename from levels/en/unused/restore rename to levels/unused/en/restore diff --git a/levels/en/unused/split b/levels/unused/en/split similarity index 100% rename from levels/en/unused/split rename to levels/unused/en/split diff --git a/levels/en/unused/steps b/levels/unused/en/steps similarity index 100% rename from levels/en/unused/steps rename to levels/unused/en/steps diff --git a/levels/en/unused/who-are-you b/levels/unused/en/who-are-you similarity index 100% rename from levels/en/unused/who-are-you rename to levels/unused/en/who-are-you diff --git a/levels/it/unused/checkout b/levels/unused/it/checkout similarity index 100% rename from levels/it/unused/checkout rename to levels/unused/it/checkout diff --git a/levels/it/unused/clone b/levels/unused/it/clone similarity index 100% rename from levels/it/unused/clone rename to levels/unused/it/clone diff --git a/levels/it/unused/commit b/levels/unused/it/commit similarity index 100% rename from levels/it/unused/commit rename to levels/unused/it/commit diff --git a/levels/it/unused/commit-a b/levels/unused/it/commit-a similarity index 100% rename from levels/it/unused/commit-a rename to levels/unused/it/commit-a diff --git a/levels/it/unused/fetch b/levels/unused/it/fetch similarity index 100% rename from levels/it/unused/fetch rename to levels/unused/it/fetch diff --git a/levels/it/unused/files-move b/levels/unused/it/files-move similarity index 100% rename from levels/it/unused/files-move rename to levels/unused/it/files-move diff --git a/levels/it/unused/index-mv b/levels/unused/it/index-mv similarity index 100% rename from levels/it/unused/index-mv rename to levels/unused/it/index-mv diff --git a/levels/it/unused/init b/levels/unused/it/init similarity index 100% rename from levels/it/unused/init rename to levels/unused/it/init diff --git a/levels/it/unused/pull-push b/levels/unused/it/pull-push similarity index 100% rename from levels/it/unused/pull-push rename to levels/unused/it/pull-push diff --git a/levels/it/unused/remotes-add b/levels/unused/it/remotes-add similarity index 100% rename from levels/it/unused/remotes-add rename to levels/unused/it/remotes-add diff --git a/levels/it/unused/remotes-delete b/levels/unused/it/remotes-delete similarity index 100% rename from levels/it/unused/remotes-delete rename to levels/unused/it/remotes-delete diff --git a/levels/it/unused/restore b/levels/unused/it/restore similarity index 100% rename from levels/it/unused/restore rename to levels/unused/it/restore diff --git a/levels/it/unused/split b/levels/unused/it/split similarity index 100% rename from levels/it/unused/split rename to levels/unused/it/split diff --git a/levels/it/unused/steps b/levels/unused/it/steps similarity index 100% rename from levels/it/unused/steps rename to levels/unused/it/steps diff --git a/levels/it/unused/who-are-you b/levels/unused/it/who-are-you similarity index 100% rename from levels/it/unused/who-are-you rename to levels/unused/it/who-are-you diff --git a/levels/en/workflows/gitignore b/levels/workflows/en/gitignore similarity index 100% rename from levels/en/workflows/gitignore rename to levels/workflows/en/gitignore diff --git a/levels/en/workflows/pr b/levels/workflows/en/pr similarity index 100% rename from levels/en/workflows/pr rename to levels/workflows/en/pr diff --git a/levels/it/workflows/gitignore b/levels/workflows/it/gitignore similarity index 100% rename from levels/it/workflows/gitignore rename to levels/workflows/it/gitignore diff --git a/levels/it/workflows/pr b/levels/workflows/it/pr similarity index 100% rename from levels/it/workflows/pr rename to levels/workflows/it/pr diff --git a/levels/en/workflows/sequence b/levels/workflows/sequence similarity index 100% rename from levels/en/workflows/sequence rename to levels/workflows/sequence diff --git a/scenes/Language.gd b/scenes/Language.gd index 7c0ec82..2f94fbf 100644 --- a/scenes/Language.gd +++ b/scenes/Language.gd @@ -29,7 +29,7 @@ func _on_item_pressed(id): var value = tr(game.languages[key]) if value == lang: game.os_lang = key - game.levels_dir = "res://levels/" + key +# game.levels_dir = "res://levels/" + key check_current_items() TranslationServer.set_locale(game.os_lang) diff --git a/scenes/chapter.gd b/scenes/chapter.gd index 856f59b..f6f09d1 100644 --- a/scenes/chapter.gd +++ b/scenes/chapter.gd @@ -8,12 +8,14 @@ var levels func load(path): levels = [] - var parts = path.split("/") - slug = parts[parts.size()-1] +# var parts = path.split("/") +# slug = parts[parts.size()-1] + slug = path var level_names = [] var dir = Directory.new() - dir.open(game.levels_dir + "/%s" % slug) +# dir.open(game.levels_dir + "/%s" % slug) + dir.open(game.levels_dir + "/" + path + "/" + game.os_lang + "/") dir.list_dir_begin() while true: @@ -28,7 +30,8 @@ func load(path): var final_level_sequence = [] - var level_sequence = Array(helpers.read_file(game.levels_dir + "/%s/sequence" % slug, "").split("\n")) +# var level_sequence = Array(helpers.read_file(game.levels_dir + "/%s/sequence" % slug, "").split("\n")) + var level_sequence = Array(helpers.read_file(game.levels_dir + "/" + path + "/sequence").split("\n")) for level in level_sequence: if level == "": @@ -42,7 +45,8 @@ func load(path): for l in final_level_sequence: var level = Level.new() - level.load(game.levels_dir + "/%s/%s" % [slug, l]) +# level.load(game.levels_dir + "/%s/%s" % [slug, l]) + level.load(game.levels_dir + "/" + path + "/" + game.os_lang + "/" + l) levels.push_back(level) func _to_string(): diff --git a/scenes/game.gd b/scenes/game.gd index cf84db2..7249cb2 100644 --- a/scenes/game.gd +++ b/scenes/game.gd @@ -2,7 +2,7 @@ extends Node var languages = {"en": tr("English"), "it": tr("Italian")} # Localizations allowed var os_lang = OS.get_locale_language() # Variable for game localization (it, en, ecc...) -var levels_dir = "res://levels/" + os_lang +var levels_dir = "res://levels" var tmp_prefix = OS.get_user_data_dir() + "/tmp/" var global_shell diff --git a/scenes/levels.gd b/scenes/levels.gd index 6fff54f..8485ecf 100644 --- a/scenes/levels.gd +++ b/scenes/levels.gd @@ -13,7 +13,7 @@ func reload(): dir.list_dir_begin() var chapter_names = [] - + while true: var file = dir.get_next() if file == "": @@ -40,5 +40,6 @@ func reload(): for c in final_chapter_sequence: var chapter = Chapter.new() - chapter.load(game.levels_dir + "/%s" % c) +# chapter.load(game.levels_dir + "/" + c + "/" + game.os_lang) + chapter.load(c) chapters.push_back(chapter)