From 90e62fb559ae31ab8582c37c3e2a2544f52f72be Mon Sep 17 00:00:00 2001
From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
Date: Mon, 16 Oct 2023 17:13:47 +0200
Subject: [PATCH] move custom level folders

---
 custom_levels/{ => jak1}/test-zone/test-zone.jsonc |   2 +-
 custom_levels/{ => jak1}/test-zone/test-zone2.glb  | Bin
 custom_levels/{ => jak1}/test-zone/testzone.gd     |   0
 goal_src/jak1/game.gp                              |   8 ++++----
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename custom_levels/{ => jak1}/test-zone/test-zone.jsonc (98%)
 rename custom_levels/{ => jak1}/test-zone/test-zone2.glb (100%)
 rename custom_levels/{ => jak1}/test-zone/testzone.gd (100%)

diff --git a/custom_levels/test-zone/test-zone.jsonc b/custom_levels/jak1/test-zone/test-zone.jsonc
similarity index 98%
rename from custom_levels/test-zone/test-zone.jsonc
rename to custom_levels/jak1/test-zone/test-zone.jsonc
index 1f3420d4c9..5c3ecaf943 100644
--- a/custom_levels/test-zone/test-zone.jsonc
+++ b/custom_levels/jak1/test-zone/test-zone.jsonc
@@ -10,7 +10,7 @@
   // Must have vertex colors. Use the blender cycles renderer, bake, diffuse, uncheck color,
   // and bake to vertex colors. For now, only the first vertex color group is used, so make sure you
   // only have 1.
-  "gltf_file": "custom_levels/test-zone/test-zone2.glb",
+  "gltf_file": "custom_levels/jak1/test-zone/test-zone2.glb",
 
   // automatically set wall vs. ground based on angle. Useful if you don't want to assign this yourself
   "automatic_wall_detection": true,
diff --git a/custom_levels/test-zone/test-zone2.glb b/custom_levels/jak1/test-zone/test-zone2.glb
similarity index 100%
rename from custom_levels/test-zone/test-zone2.glb
rename to custom_levels/jak1/test-zone/test-zone2.glb
diff --git a/custom_levels/test-zone/testzone.gd b/custom_levels/jak1/test-zone/testzone.gd
similarity index 100%
rename from custom_levels/test-zone/testzone.gd
rename to custom_levels/jak1/test-zone/testzone.gd
diff --git a/goal_src/jak1/game.gp b/goal_src/jak1/game.gp
index 0d7f3c540b..88da8f166f 100644
--- a/goal_src/jak1/game.gp
+++ b/goal_src/jak1/game.gp
@@ -154,9 +154,9 @@
   )
 
 (defun custom-level-cgo (output-name desc-file-name)
-  "Add a CGO with the given output name (in $OUT/iso) and input name (in custom_levels/)"
+  "Add a CGO with the given output name (in $OUT/iso) and input name (in custom_levels/jak1/)"
   (let ((out-name (string-append "$OUT/iso/" output-name)))
-    (defstep :in (string-append "custom_levels/" desc-file-name)
+    (defstep :in (string-append "custom_levels/jak1/" desc-file-name)
       :tool 'dgo
       :out `(,out-name)
       )
@@ -208,7 +208,7 @@
   )
 
 (defmacro build-custom-level (name)
-  (let* ((path (string-append "custom_levels/" name "/" name ".jsonc")))
+  (let* ((path (string-append "custom_levels/jak1/" name "/" name ".jsonc")))
     `(defstep :in ,path
               :tool 'build-level
               :out '(,(string-append "$OUT/obj/" name ".go")))))
@@ -1636,7 +1636,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Set up the build system to build the level geometry
-;; this path is relative to the custom_levels/ folder
+;; this path is relative to the custom_levels/jak1 folder
 ;; it should point to the .jsonc file that specifies the level.
 (build-custom-level "test-zone")
 ;; the DGO file