More work on level layout procgen

Author: Interrupt

assets/levels/ends/1.map

@@ -55,13 +55,13 @@
 {
 "classname" "info_landmark"
 "origin" "0 64 8"
-"angle" "90"
+"angle" "270"
 }
 // entity 2
 {
 "classname" "prop_text"
-"origin" "24 -528 104"
-"angle" "180"
+"origin" "32 -520 104"
+"angle" "90"
 "text" "End Room"
 }
 // entity 3

assets/levels/halls/1.map

@@ -37,7 +37,7 @@
 {
 "classname" "info_landmark"
 "origin" "0 64 8"
-"angle" "90"
+"angle" "270"
 }
 // entity 2
 {
@@ -49,8 +49,8 @@
 // entity 3
 {
 "classname" "prop_text"
-"origin" "88 -296 120"
-"angle" "180"
+"origin" "104 -296 120"
+"angle" "90"
 "text" "Hallway"
 }
 // entity 4

assets/levels/halls/2.map

@@ -0,0 +1,88 @@
+// Game: Generic
+// Format: Standard
+// entity 0
+{
+"classname" "worldspawn"
+"_tb_def" "external:../../SuperBoardingParty.fgd"
+"message" ""
+// brush 0
+{
+( -64 -32 -16 ) ( -64 -31 -16 ) ( -64 -32 -15 ) greybox-green 0 0 0 1 1
+( -64 -704 -16 ) ( -64 -704 -15 ) ( -63 -704 -16 ) greybox-green 0 0 0 1 1
+( -64 -32 -16 ) ( -63 -32 -16 ) ( -64 -31 -16 ) greybox-green 0 0 0 1 1
+( 64 64 0 ) ( 64 65 0 ) ( 65 64 0 ) greybox-green 0 0 0 1 1
+( 64 64 0 ) ( 65 64 0 ) ( 64 64 1 ) greybox-green 0 0 0 1 1
+( 64 64 0 ) ( 64 64 1 ) ( 64 65 0 ) greybox-green 0 0 0 1 1
+}
+// brush 1
+{
+( 56 -48 0 ) ( 56 -47 0 ) ( 56 -48 1 ) greybox-wall 0 0 0 1 1
+( 56 -576 0 ) ( 56 -576 1 ) ( 57 -576 0 ) greybox-wall 0 0 0 1 1
+( 56 -48 0 ) ( 57 -48 0 ) ( 56 -47 0 ) greybox-wall 0 0 0 1 1
+( 64 64 32 ) ( 64 65 32 ) ( 65 64 32 ) greybox-wall 0 0 0 1 1
+( 64 64 8 ) ( 65 64 8 ) ( 64 64 9 ) greybox-wall 0 0 0 1 1
+( 64 64 8 ) ( 64 64 9 ) ( 64 65 8 ) greybox-wall 0 0 0 1 1
+}
+// brush 2
+{
+( -64 -48 0 ) ( -64 -47 0 ) ( -64 -48 1 ) greybox-wall 0 0 0 1 1
+( -64 -704 0 ) ( -64 -704 1 ) ( -63 -704 0 ) greybox-wall -8 0 0 1 1
+( -64 -48 0 ) ( -63 -48 0 ) ( -64 -47 0 ) greybox-wall -8 0 0 1 1
+( -56 64 32 ) ( -56 65 32 ) ( -55 64 32 ) greybox-wall -8 0 0 1 1
+( -56 64 8 ) ( -55 64 8 ) ( -56 64 9 ) greybox-wall -8 0 0 1 1
+( -56 64 8 ) ( -56 64 9 ) ( -56 65 8 ) greybox-wall 0 0 0 1 1
+}
+// brush 3
+{
+( 64 -32 -16 ) ( 64 -31 -16 ) ( 64 -32 -15 ) greybox-green 0 0 0 1 1
+( 64 -704 -16 ) ( 64 -704 -15 ) ( 65 -704 -16 ) greybox-green 0 0 0 1 1
+( 64 -32 -16 ) ( 65 -32 -16 ) ( 64 -31 -16 ) greybox-green 0 0 0 1 1
+( 192 64 0 ) ( 192 65 0 ) ( 193 64 0 ) greybox-green 0 0 0 1 1
+( 192 -576 0 ) ( 193 -576 0 ) ( 192 -576 1 ) greybox-green 0 0 0 1 1
+( 272 64 0 ) ( 272 64 1 ) ( 272 65 0 ) greybox-green 0 0 0 1 1
+}
+// brush 4
+{
+( 56 -576 8 ) ( 56 -575 8 ) ( 56 -576 9 ) greybox-wall 0 0 0 1 1
+( 168 -584 0 ) ( 167 -584 0 ) ( 168 -584 1 ) greybox-wall -8 0 180.00002 1 -1
+( 168 -584 0 ) ( 168 -583 0 ) ( 167 -584 0 ) greybox-wall 0 8 90 1 1
+( 56 -576 32 ) ( 55 -576 32 ) ( 56 -575 32 ) greybox-wall 0 8 90 1 1
+( 56 -576 8 ) ( 56 -576 9 ) ( 55 -576 8 ) greybox-wall -8 0 180.00002 1 -1
+( 272 -584 0 ) ( 272 -584 1 ) ( 272 -583 0 ) greybox-wall 0 0 0 1 1
+}
+// brush 5
+{
+( -56 -696 8 ) ( -56 -695 8 ) ( -56 -696 9 ) greybox-wall 120 0 0 1 1
+( 168 -704 0 ) ( 167 -704 0 ) ( 168 -704 1 ) greybox-wall -8 0 180.00002 1 -1
+( 168 -704 0 ) ( 168 -703 0 ) ( 167 -704 0 ) greybox-wall 120 8 90 1 1
+( 56 -696 32 ) ( 55 -696 32 ) ( 56 -695 32 ) greybox-wall 120 8 90 1 1
+( 56 -696 8 ) ( 56 -696 9 ) ( 55 -696 8 ) greybox-wall -8 0 180.00002 1 -1
+( 272 -704 0 ) ( 272 -704 1 ) ( 272 -703 0 ) greybox-wall 120 0 0 1 1
+}
+}
+// entity 1
+{
+"classname" "info_landmark"
+"origin" "0 64 8"
+"angle" "270"
+}
+// entity 2
+{
+"classname" "info_streaming_level"
+"origin" "272 -640 8"
+"angle" "0"
+"level" "assets/levels/rooms"
+}
+// entity 3
+{
+"classname" "prop_text"
+"origin" "104 -296 120"
+"angle" "90"
+"text" "Hallway"
+}
+// entity 4
+{
+"classname" "light"
+"origin" "8 -296 56"
+"radius" "15"
+}

assets/levels/rooms/1.map

@@ -32,12 +32,48 @@
 ( -376 64 8 ) ( -375 64 8 ) ( -376 64 9 ) greybox-wall 56 0 0 1 1
 ( -376 64 8 ) ( -376 64 9 ) ( -376 65 8 ) greybox-wall 0 0 0 1 1
 }
+// brush 3
+{
+( 104 48 0 ) ( 104 49 0 ) ( 104 48 1 ) greybox-wall-player 0 0 0 1 1
+( 104 48 0 ) ( 104 48 1 ) ( 105 48 0 ) greybox-wall-player -8 0 0 1 1
+( 104 48 0 ) ( 105 48 0 ) ( 104 49 0 ) greybox-wall-player -8 0 0 1 1
+( 248 64 128 ) ( 248 65 128 ) ( 249 64 128 ) greybox-wall-player -8 0 0 1 1
+( 248 64 16 ) ( 249 64 16 ) ( 248 64 17 ) greybox-wall-player -8 0 0 1 1
+( 248 64 16 ) ( 248 64 17 ) ( 248 65 16 ) greybox-wall-player 0 0 0 1 1
+}
+// brush 4
+{
+( -376 48 0 ) ( -376 49 0 ) ( -376 48 1 ) greybox-wall-player 0 0 0 1 1
+( -376 48 0 ) ( -376 48 1 ) ( -375 48 0 ) greybox-wall-player 88 0 0 1 1
+( -376 48 0 ) ( -375 48 0 ) ( -376 49 0 ) greybox-wall-player 88 0 0 1 1
+( -232 64 128 ) ( -232 65 128 ) ( -231 64 128 ) greybox-wall-player 88 0 0 1 1
+( -232 64 16 ) ( -231 64 16 ) ( -232 64 17 ) greybox-wall-player 88 0 0 1 1
+( -232 64 16 ) ( -232 64 17 ) ( -232 65 16 ) greybox-wall-player 0 0 0 1 1
+}
+// brush 5
+{
+( -376 -704 16 ) ( -376 -704 17 ) ( -376 -705 16 ) greybox-wall-player 0 0 179.99998 1 -1
+( -376 -704 16 ) ( -377 -704 16 ) ( -376 -704 17 ) greybox-wall-player -8 0 180.00002 1 -1
+( -232 -688 0 ) ( -233 -688 0 ) ( -232 -689 0 ) greybox-wall-player -8 0 179.99998 1 1
+( -376 -704 128 ) ( -376 -705 128 ) ( -377 -704 128 ) greybox-wall-player -8 0 179.99998 1 1
+( -232 -688 0 ) ( -232 -688 1 ) ( -233 -688 0 ) greybox-wall-player -8 0 180.00002 1 -1
+( -232 -688 0 ) ( -232 -689 0 ) ( -232 -688 1 ) greybox-wall-player 0 0 179.99998 1 -1
+}
+// brush 6
+{
+( 104 -704 16 ) ( 104 -704 17 ) ( 104 -705 16 ) greybox-wall-player 0 0 179.99998 1 -1
+( 104 -704 16 ) ( 103 -704 16 ) ( 104 -704 17 ) greybox-wall-player -40 0 180.00002 1 -1
+( 248 -688 0 ) ( 247 -688 0 ) ( 248 -689 0 ) greybox-wall-player -40 0 179.99998 1 1
+( 104 -704 128 ) ( 104 -705 128 ) ( 103 -704 128 ) greybox-wall-player -40 0 179.99998 1 1
+( 248 -688 0 ) ( 248 -688 1 ) ( 247 -688 0 ) greybox-wall-player -40 0 180.00002 1 -1
+( 248 -688 0 ) ( 248 -689 0 ) ( 248 -688 1 ) greybox-wall-player 0 0 179.99998 1 -1
+}
 }
 // entity 1
 {
 "classname" "info_landmark"
 "origin" "0 64 8"
-"angle" "90"
+"angle" "270"
 }
 // entity 2
 {
@@ -49,8 +85,8 @@
 // entity 3
 {
 "classname" "prop_text"
-"origin" "8 -280 72"
-"angle" "180"
+"origin" "24 -280 72"
+"angle" "90"
 "text" "Room"
 }
 // entity 4

assets/test.map

@@ -2557,3 +2557,10 @@
 "radius" "4"
 "brightness" "1"
 }
+// entity 65
+{
+"classname" "info_streaming_level"
+"origin" "1488 -666 -120"
+"angle" "270"
+"level" "assets/levels/halls"
+}

entities/quakemap.zig

@@ -114,6 +114,10 @@ pub const QuakeMapComponent = struct {
             self.owner_id = self.owner.id;
         }
 
+        self.findLevel() catch {
+            delve.debug.log("Could not find random level!", .{});
+        };
+
         self.init_world() catch {
             delve.debug.log("Could not init quake map component!", .{});
         };
@@ -177,6 +181,41 @@ pub const QuakeMapComponent = struct {
         return anim_textures;
     }
 
+    pub fn findLevel(self: *QuakeMapComponent) !void {
+        var rand = std.rand.DefaultPrng.init(@bitCast(std.time.milliTimestamp()));
+        var random = rand.random();
+
+        // Read through the filename to check if it's a directory, then list files
+        var dir = try std.fs.cwd().openDir(self.filename.str, .{ .iterate = true });
+        defer dir.close();
+
+        var found_maps = std.ArrayList([]const u8).init(delve.mem.getAllocator());
+        defer found_maps.deinit();
+
+        var it = dir.iterate();
+        while (try it.next()) |entry| {
+            if (entry.kind == .file) {
+                if (!std.mem.endsWith(u8, entry.name, ".map"))
+                    continue;
+
+                try found_maps.append(entry.name);
+            }
+        }
+
+        if (found_maps.items.len == 0)
+            return;
+
+        const picked_index = random.intRangeAtMost(usize, 0, found_maps.items.len - 1);
+        const picked_file = found_maps.items[picked_index];
+        delve.debug.log("Picked random map file: {s}", .{picked_file});
+
+        var new_path = std.ArrayList(u8).init(delve.mem.getAllocator());
+        defer new_path.deinit();
+
+        try new_path.writer().print("{s}/{s}", .{ self.filename.str, picked_file });
+        self.filename.set(new_path.items);
+    }
+
     pub fn init_world(self: *QuakeMapComponent) !void {
         const allocator = delve.mem.getAllocator();