From b5ca48e1b3fce8e250b1bc3279fe421c6a1182bb Mon Sep 17 00:00:00 2001 From: Louis Pearson Date: Thu, 4 Aug 2022 14:48:29 -0600 Subject: [PATCH] Render one-way platforms --- assets/maps/wired.ldtk | 34 ++++++++++++++++++++-------------- tools/LDtkImport.zig | 5 +---- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/assets/maps/wired.ldtk b/assets/maps/wired.ldtk index a07877b..ebcb6da 100644 --- a/assets/maps/wired.ldtk +++ b/assets/maps/wired.ldtk @@ -2548,7 +2548,7 @@ }, { "__identifier": "Coin", - "__grid": [2,11], + "__grid": [8,4], "__pivot": [0,0], "__tags": [], "__tile": { "tilesetUid": 1, "x": 32, "y": 0, "w": 8, "h": 8 }, @@ -2557,7 +2557,7 @@ "width": 8, "height": 8, "defUid": 61, - "px": [16,88], + "px": [64,32], "fieldInstances": [] }, { @@ -2735,12 +2735,12 @@ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0, - 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, - 1,0,0,0,0,1,1,0,0,0,0,1,1,0,0,0,0,1,1,1,1,1,0,0,0,1,1,0,0,0,0,1,0,0,0, - 0,0,1,1,1,1,0,0,0,0,1,1,0,0,0,0,1,1,1,0,0,0,1,1,1,1,0,0,0,1,1,1,0,0,0, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + 1,0,0,0,0,1,1,0,0,0,0,1,1,0,0,0,0,1,1,1,1,0,0,3,3,1,1,0,0,0,0,1,0,0,0, + 0,0,1,1,1,1,0,0,0,0,1,1,0,0,0,0,1,1,3,3,0,0,1,1,1,1,0,0,3,3,1,1,0,0,0, 0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,0,0,1,1,1, - 1,1,0,0,0,1,0,0,0,0,1,1,1,0,0,0,0,1,1,1,1,1,0,0,0,1,3,3,0,0,1,1,1,0,0, + 1,1,0,0,0,1,0,0,0,0,1,1,1,0,0,0,0,1,1,1,1,1,0,0,0,1,1,3,0,0,1,1,1,0,0, 3,3,1,1,1,1,1,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,3,3, 1,1,1,3,3,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 @@ -2797,6 +2797,7 @@ { "px": [0,48], "src": [88,56], "f": 0, "t": 123, "d": [6,120] }, { "px": [0,56], "src": [88,56], "f": 0, "t": 123, "d": [6,140] }, { "px": [48,56], "src": [88,56], "f": 0, "t": 123, "d": [6,146] }, + { "px": [0,64], "src": [88,56], "f": 0, "t": 123, "d": [6,160] }, { "px": [48,64], "src": [88,56], "f": 0, "t": 123, "d": [6,166] }, { "px": [0,72], "src": [88,56], "f": 0, "t": 123, "d": [6,180] }, { "px": [48,72], "src": [88,56], "f": 0, "t": 123, "d": [6,186] }, @@ -2835,7 +2836,6 @@ { "px": [112,48], "src": [56,56], "f": 0, "t": 119, "d": [7,134] }, { "px": [120,48], "src": [56,56], "f": 0, "t": 119, "d": [7,135] }, { "px": [128,48], "src": [56,56], "f": 0, "t": 119, "d": [7,136] }, - { "px": [40,80], "src": [56,56], "f": 0, "t": 119, "d": [7,205] }, { "px": [16,104], "src": [56,56], "f": 0, "t": 119, "d": [7,262] }, { "px": [24,104], "src": [56,56], "f": 0, "t": 119, "d": [7,263] }, { "px": [32,104], "src": [56,56], "f": 0, "t": 119, "d": [7,264] }, @@ -2845,6 +2845,7 @@ { "px": [72,104], "src": [56,56], "f": 0, "t": 119, "d": [7,269] }, { "px": [144,128], "src": [56,56], "f": 0, "t": 119, "d": [7,338] }, { "px": [88,136], "src": [56,56], "f": 0, "t": 119, "d": [7,351] }, + { "px": [40,48], "src": [104,56], "f": 0, "t": 125, "d": [8,125] }, { "px": [40,56], "src": [104,56], "f": 0, "t": 125, "d": [8,145] }, { "px": [88,56], "src": [104,56], "f": 0, "t": 125, "d": [8,151] }, { "px": [136,56], "src": [104,56], "f": 0, "t": 125, "d": [8,157] }, @@ -2868,31 +2869,36 @@ { "px": [0,136], "src": [24,56], "f": 0, "t": 115, "d": [10,340] }, { "px": [96,136], "src": [24,56], "f": 0, "t": 115, "d": [10,352] }, { "px": [88,72], "src": [40,56], "f": 0, "t": 117, "d": [11,191] }, + { "px": [40,80], "src": [40,56], "f": 0, "t": 117, "d": [11,205] }, + { "px": [40,120], "src": [40,56], "f": 0, "t": 117, "d": [11,305] }, { "px": [136,128], "src": [40,56], "f": 0, "t": 117, "d": [11,337] }, { "px": [80,136], "src": [40,56], "f": 0, "t": 117, "d": [11,350] }, { "px": [152,136], "src": [40,56], "f": 0, "t": 117, "d": [11,359] }, { "px": [40,40], "src": [96,56], "f": 0, "t": 124, "d": [12,105] }, - { "px": [96,72], "src": [48,56], "f": 0, "t": 118, "d": [13,192] }, { "px": [88,64], "src": [72,56], "f": 0, "t": 121, "d": [14,171] }, { "px": [40,112], "src": [72,56], "f": 0, "t": 121, "d": [14,285] }, - { "px": [8,64], "src": [16,56], "f": 0, "t": 114, "d": [20,161] }, - { "px": [104,72], "src": [16,56], "f": 0, "t": 114, "d": [20,193] }, - { "px": [32,48], "src": [32,56], "f": 0, "t": 116, "d": [22,124] }, - { "px": [32,80], "src": [32,56], "f": 0, "t": 116, "d": [22,204] }, - { "px": [40,120], "src": [8,56], "f": 0, "t": 113, "d": [23,305] }, + { "px": [96,72], "src": [16,56], "f": 0, "t": 114, "d": [20,192] }, + { "px": [48,120], "src": [16,56], "f": 0, "t": 114, "d": [20,306] }, { "px": [136,144], "src": [0,56], "f": 0, "t": 112, "d": [85,377] }, { "px": [152,144], "src": [0,56], "f": 0, "t": 112, "d": [85,379] }, { "px": [144,144], "src": [8,56], "f": 0, "t": 113, "d": [90,378] }, { "px": [144,136], "src": [64,56], "f": 0, "t": 120, "d": [91,358] }, + { "px": [24,48], "src": [8,16], "f": 0, "t": 33, "d": [125,123] }, + { "px": [24,64], "src": [8,16], "f": 0, "t": 33, "d": [125,163] }, + { "px": [24,80], "src": [8,16], "f": 0, "t": 33, "d": [125,203] }, { "px": [120,88], "src": [8,16], "f": 0, "t": 33, "d": [125,235] }, { "px": [120,120], "src": [8,16], "f": 0, "t": 33, "d": [125,315] }, { "px": [64,136], "src": [8,16], "f": 0, "t": 33, "d": [125,348] }, + { "px": [112,72], "src": [24,16], "f": 0, "t": 35, "d": [126,194] }, { "px": [112,104], "src": [24,16], "f": 0, "t": 35, "d": [126,274] }, { "px": [56,120], "src": [24,16], "f": 0, "t": 35, "d": [126,307] }, { "px": [112,136], "src": [24,16], "f": 0, "t": 35, "d": [126,354] }, + { "px": [32,48], "src": [16,16], "f": 0, "t": 34, "d": [127,124] }, + { "px": [32,64], "src": [16,16], "f": 0, "t": 34, "d": [127,164] }, + { "px": [104,72], "src": [16,16], "f": 0, "t": 34, "d": [127,193] }, + { "px": [32,80], "src": [16,16], "f": 0, "t": 34, "d": [127,204] }, { "px": [128,88], "src": [16,16], "f": 0, "t": 34, "d": [127,236] }, { "px": [104,104], "src": [16,16], "f": 0, "t": 34, "d": [127,273] }, - { "px": [48,120], "src": [16,16], "f": 0, "t": 34, "d": [127,306] }, { "px": [128,120], "src": [16,16], "f": 0, "t": 34, "d": [127,316] }, { "px": [72,136], "src": [16,16], "f": 0, "t": 34, "d": [127,349] }, { "px": [104,136], "src": [16,16], "f": 0, "t": 34, "d": [127,353] } diff --git a/tools/LDtkImport.zig b/tools/LDtkImport.zig index f8365a3..e10cbd9 100644 --- a/tools/LDtkImport.zig +++ b/tools/LDtkImport.zig @@ -117,15 +117,12 @@ fn make(step: *std.build.Step) !void { for (circuit.intGridCsv) |cir64, i| { const cir = @intCast(u4, cir64); const col = collision.intGridCsv[i]; - if (col != 2) { + if (col < 2) { tiles[i] = world.TileData{ .flags = .{ .solid = col == 1, .circuit = cir, } }; } - // if (col == 2) { - // tiles[i].is_tile = true; - // } } try level.write(writer);