From bc095890e71872c8ccfcb53a89b3ae9b13c32da3 Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Fri, 1 Jul 2022 21:43:22 -0400 Subject: [PATCH] start map warping Signed-off-by: Xe Iaso --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 4 +- build.zig | 2 +- maps/RPGmap.json | 32 ++- maps/RPGmap.tmx | 9 +- maps/dungeon.json | 184 ++++++++++++ maps/dungeon.tmx | 52 ++++ maps/rpgbig.json | 658 ------------------------------------------- maps/rpgbig.tmx | 109 ------- sprites/dungeon.tsx | 4 + src/main.zig | 8 +- src/maps/dungeon.zig | 72 +++++ src/maps/rpgbig.zig | 113 -------- src/sprites.zig | 8 +- src/tools/genmap.js | 12 +- 15 files changed, 375 insertions(+), 892 deletions(-) delete mode 100644 .DS_Store create mode 100644 maps/dungeon.json create mode 100644 maps/dungeon.tmx delete mode 100644 maps/rpgbig.json delete mode 100644 maps/rpgbig.tmx create mode 100644 sprites/dungeon.tsx create mode 100644 src/maps/dungeon.zig delete mode 100644 src/maps/rpgbig.zig diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index aa3210dc22effcd58530251692b101f531c7abc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T317H;B-KqBj@37Hm~S@sieh@n}R3Dz!01gK0K2sXdfJu6p!kd;y=q z=W+I@qE^w1qA~-s-|XznZuU#q%>V$a_kt=w2>>{%!h(a%JEF#wj!D6KrVyE)BZD@i zem_n8Xe^o>zmWm;?xrDy1iBEyi}xpe9J%+CC`_|T<&hO8ijz~*obwre>Rrmdm$kB9 zT5olaRqsH`$RF7)|1fO#o29uO8E369Zg+J;7_>3u#5gplR_>tZ=f2i#(-K{^=-ir#p5S3hhw%WDVjUyRf;0mK%ym&M+i2-7O82DZW z?7_olzIPd#ofsen{vZSDd=RJ#U5mLveRN=>O8~?oy0xIKY6+DiEV>qRgE)f1Oe&&D zWwyj%CLR64#<>=AgC-rAEk2lCnb``3>D6(5p~Hc>2B{?mh=JD(Oqgy--T%8E*Z;4R zs7DMC1OJKvR&02UI&R6{tz(;0cdbA@Lsg>Ua)Zw)Xy~gLW7So>h^htsLK%pz#oQoz QQ0PZM(?AU|@S_Yo0d-hwxc~qF diff --git a/.gitignore b/.gitignore index 4a0641e..95ef45a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ zig-cache/ -zig-out/ \ No newline at end of file +zig-out/ + +.DS_Store \ No newline at end of file diff --git a/build.zig b/build.zig index 949d1dd..affd048 100644 --- a/build.zig +++ b/build.zig @@ -5,7 +5,7 @@ fn mapgen(b: *std.build.Step) !void { var alloc = std.heap.page_allocator; const maps = [_][2][]const u8{ - [2][]const u8{"./maps/rpgbig.json", "./src/maps/rpgbig.zig"}, + [2][]const u8{"./maps/dungeon.json", "./src/maps/dungeon.zig"}, [2][]const u8{"./maps/RPGmap.json", "./src/maps/rpg.zig"}, }; diff --git a/maps/RPGmap.json b/maps/RPGmap.json index 9f94cb9..eec3d3f 100644 --- a/maps/RPGmap.json +++ b/maps/RPGmap.json @@ -297,6 +297,34 @@ "x":0, "y":0 }, + { + "draworder":"topdown", + "id":5, + "name":"warps", + "objects":[ + { + "class":"", + "height":13.8767, + "id":35, + "name":"dungeon 1", + "properties":[ + { + "name":"warpTarget", + "type":"int", + "value":1 + }], + "rotation":0, + "visible":true, + "width":14.978, + "x":96.4757577092511, + "y":17.0704605726872 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, { "draworder":"topdown", "id":4, @@ -319,8 +347,8 @@ "x":0, "y":0 }], - "nextlayerid":5, - "nextobjectid":34, + "nextlayerid":6, + "nextobjectid":36, "orientation":"orthogonal", "renderorder":"right-down", "tiledversion":"1.9.0", diff --git a/maps/RPGmap.tmx b/maps/RPGmap.tmx index df84b8e..0781631 100644 --- a/maps/RPGmap.tmx +++ b/maps/RPGmap.tmx @@ -1,5 +1,5 @@ - + @@ -66,6 +66,13 @@ + + + + + + + diff --git a/maps/dungeon.json b/maps/dungeon.json new file mode 100644 index 0000000..cc3ecbd --- /dev/null +++ b/maps/dungeon.json @@ -0,0 +1,184 @@ +{ "compressionlevel":-1, + "height":20, + "infinite":false, + "layers":[ + { + "data":[43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 58, 59, 71, 59, 18, 59, 18, 15, 16, 17, 59, 76, 43, 43, 43, 43, + 43, 43, 43, 43, 72, 79, 32, 73, 32, 73, 32, 29, 30, 31, 57, 90, 43, 43, 43, 43, + 43, 43, 43, 43, 105, 106, 105, 106, 105, 106, 105, 106, 105, 106, 105, 106, 43, 43, 43, 43, + 43, 43, 43, 43, 117, 118, 117, 118, 117, 118, 117, 118, 117, 118, 117, 118, 43, 43, 43, 43, + 43, 43, 43, 43, 131, 132, 103, 104, 103, 104, 103, 104, 103, 104, 103, 104, 43, 43, 43, 43, + 43, 43, 43, 43, 145, 146, 117, 118, 117, 118, 117, 118, 117, 118, 117, 118, 43, 43, 43, 43, + 43, 43, 43, 43, 105, 106, 103, 104, 103, 104, 103, 104, 103, 104, 103, 104, 43, 43, 43, 43, + 43, 43, 43, 43, 117, 118, 117, 118, 117, 118, 117, 118, 117, 118, 137, 138, 43, 43, 43, 43, + 43, 43, 43, 43, 103, 104, 103, 104, 103, 104, 103, 104, 103, 104, 151, 152, 43, 43, 43, 43, + 43, 43, 43, 43, 117, 118, 117, 118, 117, 118, 117, 118, 117, 118, 117, 118, 43, 43, 43, 43, + 43, 43, 43, 43, 93, 94, 121, 94, 121, 94, 121, 94, 121, 94, 121, 94, 43, 43, 43, 43, + 43, 43, 43, 43, 107, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 43, 43, 43, 43, + 43, 43, 43, 43, 123, 122, 123, 122, 123, 122, 123, 122, 123, 122, 122, 123, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43], + "height":20, + "id":1, + "name":"map", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":20, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":2, + "name":"coll", + "objects":[ + { + "class":"", + "height":54.0289, + "id":2, + "name":"", + "rotation":0, + "visible":true, + "width":159.478, + "x":0.186306, + "y":0.372613 + }, + { + "class":"", + "height":104.332, + "id":3, + "name":"", + "rotation":0, + "visible":true, + "width":31.2995, + "x":0.186306, + "y":55.1467 + }, + { + "class":"", + "height":39.1244, + "id":4, + "name":"", + "rotation":0, + "visible":true, + "width":95.2026, + "x":32.0447, + "y":120.54 + }, + { + "class":"", + "height":104.518, + "id":5, + "name":"", + "rotation":0, + "visible":true, + "width":32.231, + "x":127.434, + "y":54.9604 + }, + { + "class":"", + "height":13.806, + "id":7, + "name":"", + "rotation":0, + "visible":true, + "width":15.1119, + "x":112.313, + "y":97.5746 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":3, + "name":"spc", + "objects":[ + { + "class":"", + "height":15.4851, + "id":6, + "name":"mara_start", + "rotation":0, + "visible":true, + "width":15.2985, + "x":40.2985, + "y":73.3209 + }], + "opacity":1, + "properties":[ + { + "name":"direction", + "type":"string", + "value":"Right" + }], + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":4, + "name":"act", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":5, + "name":"warps", + "objects":[ + { + "class":"", + "height":14, + "id":9, + "name":"overworld", + "properties":[ + { + "name":"warpTarget", + "type":"int", + "value":0 + }], + "rotation":0, + "visible":true, + "width":6, + "x":32.4477611940298, + "y":73.7835820895522 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }], + "nextlayerid":6, + "nextobjectid":10, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.9.0", + "tileheight":8, + "tilesets":[ + { + "firstgid":1, + "source":"..\/sprites\/dungeon.tsx" + }], + "tilewidth":8, + "type":"map", + "version":"1.9", + "width":20 +} \ No newline at end of file diff --git a/maps/dungeon.tmx b/maps/dungeon.tmx new file mode 100644 index 0000000..755da1c --- /dev/null +++ b/maps/dungeon.tmx @@ -0,0 +1,52 @@ + + + + + + + + +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,58,59,71,59,18,59,18,15,16,17,59,76,43,43,43,43, +43,43,43,43,72,79,32,73,32,73,32,29,30,31,57,90,43,43,43,43, +43,43,43,43,105,106,105,106,105,106,105,106,105,106,105,106,43,43,43,43, +43,43,43,43,117,118,117,118,117,118,117,118,117,118,117,118,43,43,43,43, +43,43,43,43,131,132,103,104,103,104,103,104,103,104,103,104,43,43,43,43, +43,43,43,43,145,146,117,118,117,118,117,118,117,118,117,118,43,43,43,43, +43,43,43,43,105,106,103,104,103,104,103,104,103,104,103,104,43,43,43,43, +43,43,43,43,117,118,117,118,117,118,117,118,117,118,137,138,43,43,43,43, +43,43,43,43,103,104,103,104,103,104,103,104,103,104,151,152,43,43,43,43, +43,43,43,43,117,118,117,118,117,118,117,118,117,118,117,118,43,43,43,43, +43,43,43,43,93,94,121,94,121,94,121,94,121,94,121,94,43,43,43,43, +43,43,43,43,107,108,108,108,108,108,108,108,108,108,108,108,43,43,43,43, +43,43,43,43,123,122,123,122,123,122,123,122,123,122,122,123,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maps/rpgbig.json b/maps/rpgbig.json deleted file mode 100644 index cb1f8d1..0000000 --- a/maps/rpgbig.json +++ /dev/null @@ -1,658 +0,0 @@ -{ "compressionlevel":-1, - "height":20, - "infinite":false, - "layers":[ - { - "data":[1, 1, 1, 18, 1, 19, 20, 21, 1, 18, 1, 18, 19, 68, 21, 18, 1, 18, 20, 18, - 69, 1, 35, 52, 1, 36, 53, 38, 35, 52, 35, 52, 19, 20, 21, 52, 35, 23, 81, 23, - 1, 18, 1, 18, 86, 88, 104, 1, 18, 17, 1, 18, 36, 55, 38, 18, 1, 97, 115, 99, - 35, 52, 35, 52, 105, 1, 18, 35, 92, 1, 35, 52, 1, 69, 20, 52, 35, 131, 80, 133, - 18, 69, 1, 1, 105, 35, 52, 1, 81, 84, 1, 18, 1, 18, 1, 18, 1, 108, 110, 95, - 52, 35, 1, 18, 105, 67, 66, 97, 98, 99, 35, 89, 88, 88, 88, 88, 88, 88, 107, 88, - 1, 68, 35, 52, 105, 66, 67, 114, 115, 116, 1, 105, 1, 18, 1, 18, 1, 18, 1, 18, - 18, 103, 88, 88, 106, 1, 1, 100, 118, 101, 35, 105, 35, 52, 35, 52, 35, 52, 35, 52, - 52, 1, 1, 1, 103, 88, 88, 88, 107, 88, 90, 104, 1, 18, 81, 18, 1, 69, 1, 18, - 11, 13, 12, 12, 1, 69, 1, 18, 35, 52, 105, 52, 35, 97, 98, 99, 35, 52, 35, 52, - 29, 29, 29, 29, 30, 18, 1, 18, 1, 18, 105, 18, 1, 114, 115, 116, 1, 18, 1, 18, - 29, 29, 29, 47, 35, 52, 35, 52, 35, 52, 105, 52, 35, 100, 118, 101, 84, 20, 69, 52, - 45, 47, 46, 18, 1, 57, 73, 73, 58, 18, 103, 88, 88, 88, 107, 87, 1, 18, 1, 18, - 35, 52, 35, 52, 35, 56, 23, 69, 56, 52, 35, 52, 35, 52, 35, 105, 35, 52, 35, 52, - 1, 18, 1, 18, 1, 74, 73, 73, 75, 18, 1, 18, 1, 18, 1, 105, 1, 18, 1, 18, - 35, 52, 35, 52, 35, 52, 35, 52, 35, 52, 35, 52, 35, 69, 35, 105, 35, 52, 35, 52, - 1, 18, 1, 69, 1, 18, 1, 18, 86, 88, 87, 18, 1, 18, 1, 105, 1, 69, 1, 18, - 35, 52, 35, 52, 35, 52, 35, 52, 105, 68, 105, 52, 35, 52, 35, 105, 35, 52, 35, 52, - 1, 18, 1, 18, 1, 18, 1, 18, 103, 88, 107, 88, 88, 88, 88, 107, 88, 88, 88, 88, - 35, 69, 35, 52, 35, 52, 35, 52, 35, 52, 35, 69, 35, 52, 35, 52, 35, 52, 35, 52], - "height":20, - "id":1, - "name":"map", - "opacity":1, - "type":"tilelayer", - "visible":true, - "width":20, - "x":0, - "y":0 - }, - { - "draworder":"topdown", - "id":2, - "name":"coll", - "objects":[ - { - "class":"", - "height":16.4512, - "id":1, - "name":"", - "rotation":0, - "visible":true, - "width":47.399, - "x":80.3013, - "y":-0.325766 - }, - { - "class":"", - "height":9.44722, - "id":6, - "name":"", - "rotation":0, - "visible":true, - "width":16.2883, - "x":127.863, - "y":70.3655 - }, - { - "class":"", - "height":15.8182, - "id":16, - "name":"", - "rotation":0, - "visible":true, - "width":11.4545, - "x":146.182, - "y":32 - }, - { - "class":"", - "height":12.7273, - "id":17, - "name":"", - "rotation":0, - "visible":true, - "width":11.8182, - "x":18, - "y":97.8182 - }, - { - "class":"", - "height":13.4545, - "id":18, - "name":"", - "rotation":0, - "visible":true, - "width":12, - "x":113.818, - "y":16.3636 - }, - { - "class":"", - "height":14.5455, - "id":19, - "name":"", - "rotation":0, - "visible":true, - "width":13.0909, - "x":81.2727, - "y":16.3636 - }, - { - "class":"", - "height":26.7273, - "id":20, - "name":"", - "rotation":0, - "visible":true, - "width":26, - "x":82.9091, - "y":85.2727 - }, - { - "class":"", - "height":4.54545, - "id":21, - "name":"", - "rotation":0, - "visible":true, - "width":8.18182, - "x":99.6364, - "y":80.9091 - }, - { - "class":"", - "height":17.2727, - "id":22, - "name":"", - "rotation":0, - "visible":true, - "width":47.6364, - "x":112, - "y":94.1818 - }, - { - "class":"", - "height":7.27273, - "id":23, - "name":"", - "rotation":0, - "visible":true, - "width":30.3636, - "x":120.727, - "y":86.9091 - }, - { - "class":"", - "height":7.09091, - "id":24, - "name":"", - "rotation":0, - "visible":true, - "width":16.3636, - "x":127.636, - "y":80 - }, - { - "class":"", - "height":12.5455, - "id":25, - "name":"", - "rotation":0, - "visible":true, - "width":11.4545, - "x":114.364, - "y":111.818 - }, - { - "class":"", - "height":12.5455, - "id":26, - "name":"", - "rotation":0, - "visible":true, - "width":12.1818, - "x":145.091, - "y":111.273 - }, - { - "class":"", - "height":6.54545, - "id":27, - "name":"", - "rotation":0, - "visible":true, - "width":31.0909, - "x":0.363636, - "y":153.273 - }, - { - "class":"", - "height":7.09091, - "id":28, - "name":"", - "rotation":0, - "visible":true, - "width":8.90909, - "x":11.2727, - "y":146.182 - }, - { - "class":"", - "height":5.81818, - "id":29, - "name":"", - "rotation":0, - "visible":true, - "width":8, - "x":51.8182, - "y":154 - }, - { - "class":"", - "height":26.95908776276, - "id":34, - "name":"", - "rotation":0, - "visible":true, - "width":32.0594557178768, - "x":31.6951437210827, - "y":153.739662647091 - }, - { - "class":"", - "height":14.7546358701592, - "id":35, - "name":"", - "rotation":0, - "visible":true, - "width":6.37545994389595, - "x":64.1189114357536, - "y":160.843746584575 - }, - { - "class":"", - "height":20.21931582207, - "id":36, - "name":"", - "rotation":0, - "visible":true, - "width":31.5129877226857, - "x":0, - "y":160.479434587781 - }, - { - "class":"", - "height":16.7583518525265, - "id":37, - "name":"", - "rotation":0, - "visible":true, - "width":47.1784035848301, - "x":0.546467995191082, - "y":181.791686400233 - }, - - { - "class":"", - "height":9.28995591824838, - "id":38, - "name":"", - "rotation":0, - "visible":true, - "width":6.37545994389595, - "x":48.0891835768152, - "y":180.880906408248 - }, - { - "class":"", - "height":7.46839593427813, - "id":39, - "name":"", - "rotation":0, - "visible":true, - "width":13.47954388138, - "x":9.10779991985136, - "y":199.278662246348 - }, - { - "class":"", - "height":47.1784035848301, - "id":40, - "name":"", - "rotation":0, - "visible":true, - "width":63.0259754453714, - "x":80.6951072898831, - "y":192.356734307261 - }, - { - "class":"", - "height":6.37545994389598, - "id":41, - "name":"", - "rotation":0, - "visible":true, - "width":8.92564392145434, - "x":147.910670698386, - "y":276.148493569893 - }, - { - "class":"", - "height":7.2862399358811, - "id":42, - "name":"", - "rotation":0, - "visible":true, - "width":14.2081678749681, - "x":224.780502021932, - "y":136.434842799373 - }, - { - "class":"", - "height":15.78, - "id":43, - "name":"", - "rotation":0, - "visible":true, - "width":15.4832598637473, - "x":224.051878028343, - "y":144.996174724034 - }, - { - "class":"", - "height":8.01486392946919, - "id":44, - "name":"", - "rotation":0, - "visible":true, - "width":7.10408393748406, - "x":216.765638092462, - "y":151.189478669533 - }, - { - "class":"", - "height":16.0297278589384, - "id":45, - "name":"", - "rotation":0, - "visible":true, - "width":45.5389995992568, - "x":209.479398156581, - "y":159.93296659259 - }, - { - "class":"", - "height":6.19330394549894, - "id":46, - "name":"", - "rotation":0, - "visible":true, - "width":7.65055193267514, - "x":240.263761885679, - "y":152.828882655106 - }, - { - "class":"", - "height":12.7509198877919, - "id":48, - "name":"", - "rotation":0, - "visible":true, - "width":13.297387882983, - "x":209.297242158184, - "y":177.05563044191 - }, - { - "class":"", - "height":12.5687638893949, - "id":49, - "name":"", - "rotation":0, - "visible":true, - "width":12.5687638893949, - "x":241.903165871252, - "y":177.237786440308 - }, - { - "class":"", - "height":8.92564392145434, - "id":51, - "name":"", - "rotation":0, - "visible":true, - "width":11.1115159022187, - "x":194.360450289628, - "y":37.7062916681846 - }, - { - "class":"", - "height":7.83270793107216, - "id":52, - "name":"", - "rotation":0, - "visible":true, - "width":11.1115159022187, - "x":227.148530001093, - "y":38.4349156617727 - }, - { - "class":"", - "height":44.0817516120806, - "id":54, - "name":"", - "rotation":0, - "visible":true, - "width":1, - "x":192.174578308864, - "y":0 - }, - { - "class":"", - "height":43.1709716200955, - "id":55, - "name":"", - "rotation":0, - "visible":true, - "width":1, - "x":238.624357900106, - "y":0 - }, - { - "class":"", - "height":15.5440414507772, - "id":58, - "name":"", - "rotation":0, - "visible":true, - "width":45.3367875647669, - "x":273.316062176166, - "y":47.6683937823834 - }, - { - "class":"", - "height":14.2487046632124, - "id":59, - "name":"", - "rotation":0, - "visible":true, - "width":12.1761658031088, - "x":273.575129533679, - "y":64.5077720207254 - }, - { - "class":"", - "height":14.7668393782384, - "id":60, - "name":"", - "rotation":0, - "visible":true, - "width":12.6943005181348, - "x":306.217616580311, - "y":63.7305699481865 - }, - { - "class":"", - "height":5.44041450777203, - "id":61, - "name":"", - "rotation":0, - "visible":true, - "width":34.7150259067357, - "x":279.015544041451, - "y":41.1917098445596 - }, - { - "class":"", - "height":8.03108808290155, - "id":62, - "name":"", - "rotation":0, - "visible":true, - "width":16.0621761658031, - "x":288.082901554404, - "y":32.3834196891192 - }, - - { - "class":"", - "height":6.47668393782383, - "id":64, - "name":"", - "rotation":0, - "visible":true, - "width":13.9896373056995, - "x":289.378238341969, - "y":25.6476683937824 - }], - "opacity":1, - "type":"objectgroup", - "visible":true, - "x":0, - "y":0 - }, - { - "draworder":"topdown", - "id":3, - "name":"act", - "objects":[ - { - "class":"", - "height":20, - "id":30, - "name":"sign", - "properties":[ - { - "name":"dialogue", - "type":"string", - "value":"Test message!" - }, - { - "name":"direction", - "type":"string", - "value":"Up" - }], - "rotation":0, - "visible":true, - "width":16, - "x":16, - "y":96 - }, - { - "class":"", - "height":16, - "id":31, - "name":"gravestone 1", - "properties":[ - { - "name":"dialogue", - "type":"string", - "value":"Ded." - }, - { - "name":"direction", - "type":"string", - "value":"Up" - }], - "rotation":0, - "visible":true, - "width":7, - "x":82.64, - "y":103 - }, - { - "class":"", - "height":16, - "id":32, - "name":"gravestone 2", - "properties":[ - { - "name":"dialogue", - "type":"string", - "value":"Moar ded." - }, - { - "name":"direction", - "type":"string", - "value":"Up" - }], - "rotation":0, - "visible":true, - "width":7, - "x":96.18, - "y":103.36 - }, - { - "class":"", - "height":22.7979274611399, - "id":56, - "name":"high sign", - "properties":[ - { - "name":"dialogue", - "type":"string", - "value":"Kahsis' Edge" - }, - { - "name":"direction", - "type":"string", - "value":"Up" - }], - "rotation":0, - "visible":true, - "width":6.7357512953368, - "x":208.290155440415, - "y":1.03626943005181 - }, - { - "class":"", - "height":25.1295336787565, - "id":65, - "name":"Garden Sign", - "properties":[ - { - "name":"dialogue", - "type":"string", - "value":"Check the\\ndungeons!" - }, - { - "name":"direction", - "type":"string", - "value":"Up" - }], - "rotation":0, - "visible":true, - "width":12.9533678756477, - "x":145.077720207254, - "y":272.279792746114 - }], - "opacity":1, - "type":"objectgroup", - "visible":true, - "x":0, - "y":0 - }, - { - "draworder":"topdown", - "id":4, - "name":"spc", - "objects":[ - { - "class":"", - "height":16, - "id":33, - "name":"mara_start", - "rotation":0, - "visible":true, - "width":16, - "x":32, - "y":32 - }], - "opacity":1, - "type":"objectgroup", - "visible":true, - "x":0, - "y":0 - }], - "nextlayerid":5, - "nextobjectid":66, - "orientation":"orthogonal", - "renderorder":"right-down", - "tiledversion":"1.9.0", - "tileheight":16, - "tilesets":[ - { - "firstgid":1, - "source":"..\/sprites\/kenney_rpg.tsx" - }], - "tilewidth":16, - "type":"map", - "version":"1.9", - "width":20 -} \ No newline at end of file diff --git a/maps/rpgbig.tmx b/maps/rpgbig.tmx deleted file mode 100644 index c0db020..0000000 --- a/maps/rpgbig.tmx +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - -1,1,1,18,1,19,20,21,1,18,1,18,19,68,21,18,1,18,20,18, -69,1,35,52,1,36,53,38,35,52,35,52,19,20,21,52,35,23,81,23, -1,18,1,18,86,88,104,1,18,17,1,18,36,55,38,18,1,97,115,99, -35,52,35,52,105,1,18,35,92,1,35,52,1,69,20,52,35,131,80,133, -18,69,1,1,105,35,52,1,81,84,1,18,1,18,1,18,1,108,110,95, -52,35,1,18,105,67,66,97,98,99,35,89,88,88,88,88,88,88,107,88, -1,68,35,52,105,66,67,114,115,116,1,105,1,18,1,18,1,18,1,18, -18,103,88,88,106,1,1,100,118,101,35,105,35,52,35,52,35,52,35,52, -52,1,1,1,103,88,88,88,107,88,90,104,1,18,81,18,1,69,1,18, -11,13,12,12,1,69,1,18,35,52,105,52,35,97,98,99,35,52,35,52, -29,29,29,29,30,18,1,18,1,18,105,18,1,114,115,116,1,18,1,18, -29,29,29,47,35,52,35,52,35,52,105,52,35,100,118,101,84,20,69,52, -45,47,46,18,1,57,73,73,58,18,103,88,88,88,107,87,1,18,1,18, -35,52,35,52,35,56,23,69,56,52,35,52,35,52,35,105,35,52,35,52, -1,18,1,18,1,74,73,73,75,18,1,18,1,18,1,105,1,18,1,18, -35,52,35,52,35,52,35,52,35,52,35,52,35,69,35,105,35,52,35,52, -1,18,1,69,1,18,1,18,86,88,87,18,1,18,1,105,1,69,1,18, -35,52,35,52,35,52,35,52,105,68,105,52,35,52,35,105,35,52,35,52, -1,18,1,18,1,18,1,18,103,88,107,88,88,88,88,107,88,88,88,88, -35,69,35,52,35,52,35,52,35,52,35,69,35,52,35,52,35,52,35,52 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/dungeon.tsx b/sprites/dungeon.tsx new file mode 100644 index 0000000..e6dc824 --- /dev/null +++ b/sprites/dungeon.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/src/main.zig b/src/main.zig index d27cc21..3c1898b 100644 --- a/src/main.zig +++ b/src/main.zig @@ -78,10 +78,10 @@ fn drawMap() !void { var tileX = tile % map.ts_width; var tileY = tile / map.ts_width; - if (!done) { - var buf = fmt.bufPrint(&textBuf, "{},{}: {}: {},{}", .{col, row, tile, tileX, tileY}) catch unreachable; - w4.trace(buf); - } + // if (!done) { + // var buf = fmt.bufPrint(&textBuf, "{},{}: {}: {},{}", .{col, row, tile, tileX, tileY}) catch unreachable; + // w4.trace(buf); + // } w4.blitSub( &sprites.kenney_rpg, diff --git a/src/maps/dungeon.zig b/src/maps/dungeon.zig new file mode 100644 index 0000000..1117da2 --- /dev/null +++ b/src/maps/dungeon.zig @@ -0,0 +1,72 @@ +// Generated by ./src/tools/genmap.js ./maps/dungeon.json, DO NOT EDIT + +const sh0rk = @import("../sh0rk.zig"); +const Direction = sh0rk.Direction; +const Point = sh0rk.Point; +const Tileset = sh0rk.Tileset; +const Trigger = sh0rk.Trigger; +const Rect = sh0rk.Rect; + +pub const width = 20; +pub const height = 20; + +pub const tileset: Tileset = .Dungeon; +pub const ts_width = 14; +pub const ts_height = 13; + +pub const data = [400]u9{ + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 57, 58, 70, 58, 17, 58, 17, + 14, 15, 16, 58, 75, 42, 42, 42, 42, 42, + 42, 42, 42, 71, 78, 31, 72, 31, 72, 31, + 28, 29, 30, 56, 89, 42, 42, 42, 42, 42, + 42, 42, 42, 104, 105, 104, 105, 104, 105, 104, + 105, 104, 105, 104, 105, 42, 42, 42, 42, 42, + 42, 42, 42, 116, 117, 116, 117, 116, 117, 116, + 117, 116, 117, 116, 117, 42, 42, 42, 42, 42, + 42, 42, 42, 130, 131, 102, 103, 102, 103, 102, + 103, 102, 103, 102, 103, 42, 42, 42, 42, 42, + 42, 42, 42, 144, 145, 116, 117, 116, 117, 116, + 117, 116, 117, 116, 117, 42, 42, 42, 42, 42, + 42, 42, 42, 104, 105, 102, 103, 102, 103, 102, + 103, 102, 103, 102, 103, 42, 42, 42, 42, 42, + 42, 42, 42, 116, 117, 116, 117, 116, 117, 116, + 117, 116, 117, 136, 137, 42, 42, 42, 42, 42, + 42, 42, 42, 102, 103, 102, 103, 102, 103, 102, + 103, 102, 103, 150, 151, 42, 42, 42, 42, 42, + 42, 42, 42, 116, 117, 116, 117, 116, 117, 116, + 117, 116, 117, 116, 117, 42, 42, 42, 42, 42, + 42, 42, 42, 92, 93, 120, 93, 120, 93, 120, + 93, 120, 93, 120, 93, 42, 42, 42, 42, 42, + 42, 42, 42, 106, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 42, 42, 42, 42, 42, + 42, 42, 42, 122, 121, 122, 121, 122, 121, 122, + 121, 122, 121, 121, 122, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, +}; + +pub const coll = [_]Rect{ + Rect{.base = Point{.x = 0, .y = 0}, .width = 159, .height = 54}, + Rect{.base = Point{.x = 0, .y = 55}, .width = 31, .height = 104}, + Rect{.base = Point{.x = 32, .y = 121}, .width = 95, .height = 39}, + Rect{.base = Point{.x = 127, .y = 55}, .width = 32, .height = 105}, + Rect{.base = Point{.x = 112, .y = 98}, .width = 15, .height = 14}, +}; + +pub const start_point = Point{ .x = 40, .y = 73 }; + +pub const triggers = [_]Trigger{ +}; + diff --git a/src/maps/rpgbig.zig b/src/maps/rpgbig.zig deleted file mode 100644 index e251720..0000000 --- a/src/maps/rpgbig.zig +++ /dev/null @@ -1,113 +0,0 @@ -// Generated by ./src/tools/genmap.js ./maps/rpgbig.json, DO NOT EDIT - -const sh0rk = @import("../sh0rk.zig"); -const Direction = sh0rk.Direction; -const Point = sh0rk.Point; -const Tileset = sh0rk.Tileset; -const Trigger = sh0rk.Trigger; -const Rect = sh0rk.Rect; - -pub const width = 20; -pub const height = 20; - -pub const tileset: Tileset = .Rpg; -pub const ts_width = 34; -pub const ts_height = 16; - -pub const data = [400]u9{ - 0, 0, 0, 17, 0, 18, 19, 20, 0, 17, 0, - 17, 18, 67, 20, 17, 0, 17, 19, 17, 68, - 0, 34, 51, 0, 35, 52, 37, 34, 51, 34, - 51, 18, 19, 20, 51, 34, 22, 80, 22, 0, - 17, 0, 17, 85, 87, 103, 0, 17, 16, 0, - 17, 35, 54, 37, 17, 0, 96, 114, 98, 34, - 51, 34, 51, 104, 0, 17, 34, 91, 0, 34, - 51, 0, 68, 19, 51, 34, 130, 79, 132, 17, - 68, 0, 0, 104, 34, 51, 0, 80, 83, 0, - 17, 0, 17, 0, 17, 0, 107, 109, 94, 51, - 34, 0, 17, 104, 66, 65, 96, 97, 98, 34, - 88, 87, 87, 87, 87, 87, 87, 106, 87, 0, - 67, 34, 51, 104, 65, 66, 113, 114, 115, 0, - 104, 0, 17, 0, 17, 0, 17, 0, 17, 17, - 102, 87, 87, 105, 0, 0, 99, 117, 100, 34, - 104, 34, 51, 34, 51, 34, 51, 34, 51, 51, - 0, 0, 0, 102, 87, 87, 87, 106, 87, 89, - 103, 0, 17, 80, 17, 0, 68, 0, 17, 10, - 12, 11, 11, 0, 68, 0, 17, 34, 51, 104, - 51, 34, 96, 97, 98, 34, 51, 34, 51, 28, - 28, 28, 28, 29, 17, 0, 17, 0, 17, 104, - 17, 0, 113, 114, 115, 0, 17, 0, 17, 28, - 28, 28, 46, 34, 51, 34, 51, 34, 51, 104, - 51, 34, 99, 117, 100, 83, 19, 68, 51, 44, - 46, 45, 17, 0, 56, 72, 72, 57, 17, 102, - 87, 87, 87, 106, 86, 0, 17, 0, 17, 34, - 51, 34, 51, 34, 55, 22, 68, 55, 51, 34, - 51, 34, 51, 34, 104, 34, 51, 34, 51, 0, - 17, 0, 17, 0, 73, 72, 72, 74, 17, 0, - 17, 0, 17, 0, 104, 0, 17, 0, 17, 34, - 51, 34, 51, 34, 51, 34, 51, 34, 51, 34, - 51, 34, 68, 34, 104, 34, 51, 34, 51, 0, - 17, 0, 68, 0, 17, 0, 17, 85, 87, 86, - 17, 0, 17, 0, 104, 0, 68, 0, 17, 34, - 51, 34, 51, 34, 51, 34, 51, 104, 67, 104, - 51, 34, 51, 34, 104, 34, 51, 34, 51, 0, - 17, 0, 17, 0, 17, 0, 17, 102, 87, 106, - 87, 87, 87, 87, 106, 87, 87, 87, 87, 34, - 68, 34, 51, 34, 51, 34, 51, 34, 51, 34, - 68, 34, 51, 34, 51, 34, 51, 34, 51, -}; - -pub const coll = [_]Rect{ - Rect{.base = Point{.x = 80, .y = 0}, .width = 47, .height = 16}, - Rect{.base = Point{.x = 128, .y = 70}, .width = 16, .height = 9}, - Rect{.base = Point{.x = 146, .y = 32}, .width = 11, .height = 16}, - Rect{.base = Point{.x = 18, .y = 98}, .width = 12, .height = 13}, - Rect{.base = Point{.x = 114, .y = 16}, .width = 12, .height = 13}, - Rect{.base = Point{.x = 81, .y = 16}, .width = 13, .height = 15}, - Rect{.base = Point{.x = 83, .y = 85}, .width = 26, .height = 27}, - Rect{.base = Point{.x = 100, .y = 81}, .width = 8, .height = 5}, - Rect{.base = Point{.x = 112, .y = 94}, .width = 48, .height = 17}, - Rect{.base = Point{.x = 121, .y = 87}, .width = 30, .height = 7}, - Rect{.base = Point{.x = 128, .y = 80}, .width = 16, .height = 7}, - Rect{.base = Point{.x = 114, .y = 112}, .width = 11, .height = 13}, - Rect{.base = Point{.x = 145, .y = 111}, .width = 12, .height = 13}, - Rect{.base = Point{.x = 0, .y = 153}, .width = 31, .height = 7}, - Rect{.base = Point{.x = 11, .y = 146}, .width = 9, .height = 7}, - Rect{.base = Point{.x = 52, .y = 154}, .width = 8, .height = 6}, - Rect{.base = Point{.x = 32, .y = 154}, .width = 32, .height = 27}, - Rect{.base = Point{.x = 64, .y = 161}, .width = 6, .height = 15}, - Rect{.base = Point{.x = 0, .y = 160}, .width = 32, .height = 20}, - Rect{.base = Point{.x = 1, .y = 182}, .width = 47, .height = 17}, - Rect{.base = Point{.x = 48, .y = 181}, .width = 6, .height = 9}, - Rect{.base = Point{.x = 9, .y = 199}, .width = 13, .height = 7}, - Rect{.base = Point{.x = 81, .y = 192}, .width = 63, .height = 47}, - Rect{.base = Point{.x = 148, .y = 276}, .width = 9, .height = 6}, - Rect{.base = Point{.x = 225, .y = 136}, .width = 14, .height = 7}, - Rect{.base = Point{.x = 224, .y = 145}, .width = 15, .height = 16}, - Rect{.base = Point{.x = 217, .y = 151}, .width = 7, .height = 8}, - Rect{.base = Point{.x = 209, .y = 160}, .width = 46, .height = 16}, - Rect{.base = Point{.x = 240, .y = 153}, .width = 8, .height = 6}, - Rect{.base = Point{.x = 209, .y = 177}, .width = 13, .height = 13}, - Rect{.base = Point{.x = 242, .y = 177}, .width = 13, .height = 13}, - Rect{.base = Point{.x = 194, .y = 38}, .width = 11, .height = 9}, - Rect{.base = Point{.x = 227, .y = 38}, .width = 11, .height = 8}, - Rect{.base = Point{.x = 192, .y = 0}, .width = 1, .height = 44}, - Rect{.base = Point{.x = 239, .y = 0}, .width = 1, .height = 43}, - Rect{.base = Point{.x = 273, .y = 48}, .width = 45, .height = 16}, - Rect{.base = Point{.x = 274, .y = 65}, .width = 12, .height = 14}, - Rect{.base = Point{.x = 306, .y = 64}, .width = 13, .height = 15}, - Rect{.base = Point{.x = 279, .y = 41}, .width = 35, .height = 5}, - Rect{.base = Point{.x = 288, .y = 32}, .width = 16, .height = 8}, - Rect{.base = Point{.x = 289, .y = 26}, .width = 14, .height = 6}, -}; - -pub const triggers = [_]Trigger{ - Trigger{.aura = Rect{.base = Point{.x = 16, .y = 96}, .width = 16, .height = 20}, .direction = Direction.Up, .dialogue = "Test message!"}, // sign - Trigger{.aura = Rect{.base = Point{.x = 83, .y = 103}, .width = 7, .height = 16}, .direction = Direction.Up, .dialogue = "Ded."}, // gravestone 1 - Trigger{.aura = Rect{.base = Point{.x = 96, .y = 103}, .width = 7, .height = 16}, .direction = Direction.Up, .dialogue = "Moar ded."}, // gravestone 2 - Trigger{.aura = Rect{.base = Point{.x = 208, .y = 1}, .width = 7, .height = 23}, .direction = Direction.Up, .dialogue = "Kahsis' Edge"}, // high sign - Trigger{.aura = Rect{.base = Point{.x = 145, .y = 272}, .width = 13, .height = 25}, .direction = Direction.Up, .dialogue = "Check the\ndungeons!"}, // Garden Sign -}; - -pub const start_point = Point{ .x = 32, .y = 32 }; - diff --git a/src/sprites.zig b/src/sprites.zig index 804e7b4..ba7a619 100644 --- a/src/sprites.zig +++ b/src/sprites.zig @@ -32,4 +32,10 @@ pub const kenney_rpg = [8704]u8{ 0xff,0xff,0xef,0xff,0xff,0x15,0x55,0x55,0x55,0x pub const frame_width = 24; pub const frame_height = 24; pub const frame_flags = 1; // BLIT_2BPP -pub const frame = [144]u8{ 0x05,0x55,0x55,0x55,0x55,0x50,0x1f,0xff,0xff,0xff,0xff,0xf4,0x70,0x00,0x00,0x00,0x00,0x0d,0x73,0xff,0xff,0xff,0xff,0xcd,0x77,0x00,0x00,0x00,0x00,0xdd,0x73,0x00,0x00,0x00,0x00,0xcd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x7b,0x00,0x00,0x00,0x00,0xed,0x77,0x00,0x00,0x00,0x00,0xdd,0x7b,0x00,0x00,0x00,0x00,0xed,0x77,0x00,0x00,0x00,0x00,0xdd,0x7b,0xff,0xff,0xff,0xff,0xed,0x7a,0xaa,0xaa,0xaa,0xaa,0xad,0x1f,0xff,0xff,0xff,0xff,0xf4,0x05,0x55,0x55,0x55,0x55,0x50 }; \ No newline at end of file +pub const frame = [144]u8{ 0x05,0x55,0x55,0x55,0x55,0x50,0x1f,0xff,0xff,0xff,0xff,0xf4,0x70,0x00,0x00,0x00,0x00,0x0d,0x73,0xff,0xff,0xff,0xff,0xcd,0x77,0x00,0x00,0x00,0x00,0xdd,0x73,0x00,0x00,0x00,0x00,0xcd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x77,0x00,0x00,0x00,0x00,0xdd,0x7b,0x00,0x00,0x00,0x00,0xed,0x77,0x00,0x00,0x00,0x00,0xdd,0x7b,0x00,0x00,0x00,0x00,0xed,0x77,0x00,0x00,0x00,0x00,0xdd,0x7b,0xff,0xff,0xff,0xff,0xed,0x7a,0xaa,0xaa,0xaa,0xaa,0xad,0x1f,0xff,0xff,0xff,0xff,0xf4,0x05,0x55,0x55,0x55,0x55,0x50 }; + +// dungeon +pub const dungeon_width = 112; +pub const dungeon_height = 104; +pub const dungeon_flags = 1; // BLIT_2BPP +pub const dungeon = [2912]u8{ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xa8,0xca,0xa5,0x5a,0x28,0xca,0xaa,0xaa,0xa8,0xca,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0xff,0xaa,0x00,0x00,0xaa,0xff,0xaa,0xaa,0xa9,0xba,0xc0,0x00,0x02,0xc0,0x15,0x5a,0xc2,0xd8,0x00,0x00,0x02,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x55,0xfa,0x00,0x00,0xaf,0x55,0xaa,0xaa,0xab,0xfa,0xf0,0x00,0x01,0xc0,0x0d,0x6a,0xc2,0x77,0x00,0x00,0x02,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0xaa,0x4e,0x00,0x00,0xb1,0xaa,0xaa,0xaa,0xaa,0xaa,0xcc,0x00,0x04,0x70,0x3d,0x4e,0xc0,0x6b,0x00,0x00,0x6b,0x6b,0x6b,0x6b,0x00,0x00,0x00,0x00,0xaa,0x8e,0x00,0x00,0xb2,0xaa,0xaa,0xaa,0xa6,0xea,0xf3,0x00,0x01,0x5c,0x14,0x7e,0xc1,0xbf,0x00,0x1b,0x83,0x83,0x83,0x83,0x63,0x00,0x00,0x00,0xaa,0xa3,0x00,0x00,0xca,0xaa,0xaa,0xaa,0xaf,0xea,0xcc,0x00,0x02,0xc7,0x05,0x6b,0xc6,0xc0,0x00,0xa3,0xaa,0xaa,0xaa,0xaa,0xe8,0xc0,0x00,0x00,0xaa,0xa3,0x00,0x00,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0xff,0xcc,0x00,0xc1,0xf9,0x9f,0xdb,0xc0,0x00,0xfe,0xa5,0x55,0x55,0x5a,0xbc,0xc0,0x00,0x00,0xaa,0xa3,0x00,0x00,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0xff,0xff,0xff,0xff,0x7f,0xbf,0x6f,0xff,0xfd,0xb0,0x9a,0xaa,0xaa,0xa6,0x0d,0xbf,0x00,0x00,0xaa,0xa3,0x00,0x00,0xca,0xaa,0xa8,0xca,0xaa,0xaa,0xa8,0xca,0xaa,0xaa,0x95,0xaa,0xfa,0xaa,0xaa,0x32,0x63,0xff,0xff,0xc9,0x8e,0x3a,0x63,0xff,0xff,0xc9,0x63,0xff,0xff,0xc9,0x02,0xc0,0x0a,0xa8,0x02,0xc0,0x00,0x00,0x02,0x6f,0xc0,0x00,0x02,0x32,0x4f,0xff,0xff,0xf1,0x8e,0x30,0x8f,0xff,0xff,0xf2,0x4f,0xff,0xff,0xf1,0x02,0xc0,0x2a,0x6a,0x02,0xc0,0x00,0x00,0x15,0x56,0xc0,0x00,0x02,0xf2,0x7f,0x00,0x00,0x0d,0x8e,0xf0,0xbf,0xff,0xff,0xfe,0x7f,0x00,0x00,0x0d,0x00,0x00,0xa9,0x9a,0x80,0x00,0x00,0x00,0x1f,0x7e,0xc0,0x00,0x03,0xf2,0x7c,0x8a,0x8a,0x2d,0x8f,0xf0,0xbf,0xff,0xff,0xfe,0x7c,0x8a,0x8a,0x2d,0x00,0x02,0xa6,0x66,0xa0,0x00,0x00,0x00,0x05,0x5b,0xc0,0x00,0x00,0x32,0x72,0x8a,0x8a,0x2d,0x8f,0xc0,0xbf,0xff,0xff,0xfe,0x72,0xaa,0x8a,0xad,0x02,0xca,0x99,0x59,0xa8,0xc0,0x00,0x00,0x1f,0x7e,0xc0,0x00,0x01,0xb2,0x72,0x8a,0x8a,0x2d,0x8d,0xb0,0xbf,0xff,0xff,0xfe,0x72,0x8a,0x8a,0x2d,0x00,0xca,0x5c,0xad,0x68,0xc0,0x00,0x00,0x05,0x5b,0x00,0x00,0x02,0x32,0x72,0x8a,0x8a,0x2d,0x8e,0x30,0xbf,0xff,0xff,0xfe,0x70,0x8a,0x8a,0x0d,0xff,0xf0,0xac,0x9e,0x83,0xff,0xff,0xff,0xf6,0xa7,0xff,0xff,0xfe,0x32,0x72,0x8a,0x8a,0x2d,0x8e,0x3f,0x3f,0xff,0xff,0xfc,0x72,0x65,0x59,0xad,0xaa,0xaa,0x5c,0x8d,0x6a,0xaa,0xa8,0xca,0xa6,0xeb,0xa8,0xca,0xaa,0xf2,0x72,0x8a,0x88,0x4d,0x8e,0xfa,0xbf,0xff,0xff,0xfe,0x70,0x00,0x00,0x0d,0x00,0x02,0x97,0x35,0xa0,0x00,0x02,0xc0,0x07,0x1c,0x02,0xc0,0x03,0xf2,0x72,0x8a,0x88,0xbd,0x8f,0xf0,0xbf,0xff,0xff,0xfe,0x73,0xff,0xff,0xfd,0x00,0x02,0xa5,0xd6,0xa0,0x00,0x02,0xc0,0x07,0x1c,0x02,0xc0,0x00,0x32,0x72,0x8a,0x88,0xfd,0x8f,0xc0,0xbf,0xff,0xff,0xfe,0x70,0x00,0x00,0x0d,0x00,0x00,0xaa,0x2a,0x80,0x00,0x00,0x00,0x2c,0x2c,0x00,0x00,0x01,0xb2,0x72,0x8a,0x8a,0x0d,0x8d,0x80,0xbf,0xff,0xff,0xfe,0x72,0x8a,0x8a,0x2d,0x00,0x00,0x0a,0x28,0x00,0x00,0x00,0x00,0x1c,0x1c,0x00,0x00,0x02,0x32,0x72,0x8a,0x8a,0x2d,0x8e,0x30,0xbc,0x00,0x00,0x3e,0x72,0x8a,0x8a,0x2d,0x00,0x00,0x00,0xc0,0x00,0x00,0x02,0xc0,0x1c,0x1f,0x02,0xc0,0x02,0x32,0x72,0x8a,0x8a,0x2d,0x8e,0x30,0xbf,0xff,0xff,0xfe,0x7f,0xff,0xff,0xfd,0x00,0x00,0x00,0xc0,0x00,0x00,0x00,0xc0,0x5c,0x05,0xc0,0xc0,0x02,0xf2,0x72,0x8a,0x8a,0x2d,0x8e,0xf0,0xb0,0x00,0x00,0x0e,0x79,0x24,0x92,0x4d,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf0,0x00,0x00,0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfb,0xef,0xbf,0xff,0xff,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xa3,0xaa,0xa7,0xaa,0xa3,0xca,0xaa,0xca,0xaa,0xaa,0xa3,0x00,0x00,0xa4,0xaa,0xff,0xff,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xa3,0x00,0x2b,0xaa,0xa3,0xca,0xaa,0x6a,0xaa,0xaa,0xa9,0x00,0x00,0x1d,0xc0,0xff,0xff,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xa3,0x00,0x0b,0xaa,0xa3,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0x2d,0xc0,0xff,0xff,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xa3,0x00,0x0b,0xaa,0xa3,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0x0b,0x00,0xff,0xff,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xa3,0x00,0x0b,0xaa,0xa3,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0x0d,0xc0,0xff,0xff,0xc2,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0x83,0x00,0x0b,0xaa,0xa3,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0x07,0x70,0xff,0xff,0xf0,0x00,0x00,0x00,0x00,0x00,0x2a,0xaa,0xaa,0xa8,0x00,0x0f,0x00,0x0b,0xaa,0xa3,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0x0b,0x70,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xea,0xaa,0xaa,0xab,0xff,0xff,0x33,0xf3,0xaa,0xa3,0xca,0xaa,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0xfe,0xff,0xaa,0xaa,0xc0,0xaa,0xa8,0xca,0xaa,0xa3,0xea,0xaa,0xaa,0xab,0xea,0xab,0x2a,0xa7,0xaa,0xaa,0xaa,0xaa,0xff,0x00,0xff,0xff,0x00,0xff,0xab,0x4a,0x00,0x00,0xe0,0x00,0x02,0xc0,0x00,0x03,0xea,0xaa,0xaa,0xab,0xf0,0x03,0x00,0x2b,0xaa,0xaa,0xaa,0xaa,0x55,0xf0,0x55,0x55,0x0f,0x55,0x01,0xdc,0xf3,0x3c,0xe0,0x00,0x02,0xc0,0x00,0x0f,0xea,0xaa,0xaa,0xab,0xc0,0x0b,0x00,0x0b,0xaa,0xaa,0xaa,0xaa,0xaa,0x4c,0xaa,0xaa,0x31,0xaa,0x02,0xdc,0x00,0x00,0xe0,0x00,0x00,0x00,0x00,0x33,0xea,0xaa,0xaa,0xab,0xf0,0x0b,0x00,0x0b,0xaa,0xaa,0xaa,0xaa,0xaa,0x8c,0xaa,0xaa,0x32,0xaa,0x07,0xb0,0xcf,0xcc,0xe0,0x00,0x00,0x00,0x00,0x0c,0xea,0xaa,0xaa,0xab,0xcc,0x0b,0x00,0x0b,0xaa,0xaa,0xaa,0xaa,0xaa,0xa3,0xaa,0xaa,0xca,0xaa,0x1d,0xc0,0x00,0x00,0xe0,0x00,0x02,0xc0,0x00,0x33,0xca,0xaa,0xaa,0xa3,0xf3,0x0b,0x00,0x03,0xaa,0xaa,0xaa,0xaa,0xaa,0xa3,0xaa,0xaa,0xca,0xaa,0x2d,0xc0,0x00,0x00,0xe0,0x00,0x00,0xc0,0x00,0xcf,0xc0,0x00,0x00,0x03,0xfc,0x03,0x00,0x0f,0xaa,0xa0,0x0a,0xaa,0xaa,0xa3,0xaa,0xaa,0xca,0xaa,0x0b,0x00,0xff,0xff,0xcf,0xcc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xcf,0xff,0xff,0xaa,0xa3,0xca,0xaa,0xaa,0xa3,0xaa,0xaa,0xca,0xaa,0xff,0xff,0xaa,0xaa,0xe0,0xa8,0xaa,0xaa,0x02,0xa8,0xca,0xa0,0x8a,0xa7,0xe8,0xa3,0xca,0xaa,0xaa,0xaa,0x01,0x14,0x15,0x60,0xc0,0x0f,0xaa,0xaa,0xaa,0xaa,0x00,0x00,0xe0,0x00,0x00,0x00,0xb0,0x03,0xc0,0x08,0x00,0x0b,0xc0,0x0b,0xc0,0x00,0x00,0x00,0x14,0x47,0x4d,0x68,0x00,0x6f,0x00,0x02,0xff,0xff,0x03,0xc0,0xe0,0x00,0x00,0x00,0xb0,0x03,0xc0,0x0b,0x00,0x0b,0xf0,0x0b,0xc0,0x00,0x06,0xa0,0x24,0x47,0x7d,0x38,0x00,0x3c,0x00,0x02,0xc3,0xc3,0x0f,0xf0,0xe0,0x00,0x00,0x00,0x80,0x0f,0xc0,0x0b,0x00,0x0b,0xc0,0x03,0xc0,0x00,0x08,0x3c,0x65,0x55,0x55,0xf8,0x1b,0x00,0x00,0x02,0xcb,0xcb,0x0b,0xe0,0xe0,0x00,0x00,0x00,0x30,0x33,0xc0,0x03,0x00,0x0b,0xf0,0x0b,0xc0,0x00,0x0b,0xfc,0xe7,0x77,0x51,0x6b,0x8f,0x00,0x00,0x02,0xcb,0xcb,0x02,0x80,0xe0,0x00,0x00,0x00,0x80,0x0f,0xc0,0x00,0x00,0x0b,0xcc,0x03,0xc0,0x00,0x03,0xfc,0xdb,0xb7,0x15,0xaf,0xe8,0x00,0x00,0x02,0xcb,0xcb,0x00,0x00,0xe0,0x00,0x00,0x00,0x30,0x3f,0xc0,0x03,0x00,0x03,0xff,0x3f,0xc0,0x00,0x00,0x00,0x3e,0xeb,0xe6,0x7f,0xfd,0xb0,0x00,0x02,0x86,0x86,0xff,0xff,0x3f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xff,0x3f,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xee,0xee,0xae,0xee,0xee,0xee,0xee,0xee,0xc2,0xaa,0x02,0xa7,0xee,0xee,0x00,0x00,0xcc,0xee,0xec,0xce,0xee,0xef,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xbb,0xba,0xab,0xbb,0xbb,0xbb,0xbb,0xbb,0xc0,0x00,0xb0,0x0b,0xbb,0xbb,0x00,0x00,0xf3,0x33,0x33,0xf3,0x33,0x33,0x00,0x00,0x55,0x55,0x00,0x00,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xee,0xc0,0x00,0x80,0x0b,0xee,0xaa,0x00,0x00,0xec,0xcc,0xce,0xcc,0xcc,0xcf,0x00,0x0f,0x00,0x00,0x60,0x00,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xab,0xc0,0x00,0x30,0x0b,0xaa,0xaa,0x00,0x00,0xf3,0x33,0x33,0x33,0x33,0x33,0x00,0x38,0x3f,0xfc,0x04,0x00,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xba,0xc0,0x00,0xb0,0x0b,0xba,0xaa,0x00,0x00,0xec,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0xe3,0xff,0x3f,0xc1,0x00,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xc0,0x00,0x30,0x03,0xaa,0xaa,0x00,0x00,0xf3,0x33,0x33,0xf3,0x33,0x33,0x03,0x8f,0x0f,0x0f,0xf0,0x40,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xc0,0x00,0x30,0x0b,0xaa,0xaa,0x00,0x00,0xec,0xcc,0xcc,0xcc,0xcc,0xcf,0x0e,0x3f,0x8f,0x8f,0x3c,0x10,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0x3f,0xff,0xff,0xfc,0xaa,0xaa,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x0e,0xff,0x8f,0x8f,0x0f,0x20,0x18,0x00,0x00,0x18,0xff,0xff,0xff,0xcf,0xff,0xff,0xff,0xcf,0xff,0xff,0xff,0xcf,0xec,0xec,0xcc,0xcc,0xce,0xec,0x38,0xcf,0x8f,0x8f,0x8f,0x04,0x55,0x55,0x55,0x52,0xf3,0xff,0xff,0x33,0xc0,0x0f,0xf0,0x03,0xf3,0x3f,0xf3,0x33,0xf3,0x33,0x33,0x33,0xb3,0x33,0x3b,0xcf,0x8f,0x8f,0x8f,0xc4,0x10,0x00,0x00,0x13,0xf0,0x00,0x2c,0xcf,0x00,0x03,0xf8,0x03,0xcc,0xcf,0xfc,0xcf,0xec,0xcc,0xcc,0xcc,0xfc,0xcf,0x33,0x8f,0x8f,0x8f,0x8f,0xc8,0x23,0xff,0xff,0xc3,0xe3,0xff,0x23,0xbf,0x00,0x03,0xfe,0xac,0x33,0x33,0xff,0xbf,0xf3,0x33,0xf3,0xf3,0xb3,0x3f,0x33,0x8f,0x8f,0x8f,0x8f,0x84,0x1b,0xff,0xff,0xdb,0xe0,0x00,0x23,0xfe,0x00,0x03,0x03,0xfe,0x00,0x03,0x03,0xfe,0xcc,0xcc,0xcc,0xcc,0xfc,0xff,0x33,0x8f,0x8f,0x8f,0x8f,0x88,0x55,0x55,0x55,0x52,0xe5,0x55,0x50,0xfe,0x00,0x0c,0x00,0xfe,0x00,0x0c,0x00,0xfe,0xf3,0x33,0x3f,0x3f,0xb3,0x3f,0x33,0x8f,0x8f,0x8f,0x8f,0x88,0x10,0x00,0x00,0x13,0xda,0xaa,0xa4,0xff,0xa8,0xfc,0x00,0xff,0xa8,0xfc,0x00,0xff,0xcc,0xcc,0xcc,0xcc,0xfc,0xff,0x33,0x8f,0x8f,0x8f,0x8f,0x88,0x23,0xff,0xff,0xc3,0xff,0xff,0xff,0xff,0xff,0xfe,0x08,0xff,0xff,0xfe,0x08,0xff,0x3f,0xff,0xff,0xff,0xff,0xff,0x33,0x8f,0x8f,0x8f,0x8f,0x88,0x1b,0xff,0xff,0xdb,0xc0,0x0f,0xaf,0xff,0xc0,0x0f,0xaf,0xff,0xcc,0xcf,0xff,0xff,0xee,0xee,0xcc,0xcf,0xcc,0xcc,0x33,0xff,0xff,0xff,0xff,0x88,0x55,0x55,0x55,0x52,0x00,0x0f,0xff,0xff,0x00,0x03,0xfc,0x0f,0x33,0x33,0xff,0x3f,0x33,0x33,0x3f,0x3f,0xff,0xff,0x32,0x8a,0x82,0x8a,0x8a,0x88,0x10,0x00,0x00,0x13,0x00,0x30,0x00,0x2f,0x00,0x00,0xf0,0x03,0xcc,0xcc,0xfc,0xcf,0xcc,0xcc,0xcc,0xff,0xfc,0xcf,0x30,0x30,0x30,0x30,0x30,0x08,0x23,0xff,0xff,0xc3,0x00,0xe3,0xff,0x23,0x00,0x00,0xc0,0x03,0x33,0x33,0xf3,0x33,0x33,0x33,0xff,0xff,0xff,0xff,0x3f,0xcf,0xcf,0xcf,0xcf,0xfc,0x0f,0xff,0xff,0xff,0x80,0xe0,0x00,0x23,0x80,0x00,0xc0,0x03,0x80,0x00,0xc0,0x03,0xcc,0xcc,0xcc,0xff,0xfc,0xff,0x3f,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0xe8,0xe5,0x55,0x53,0xe8,0x00,0xc0,0x03,0xe8,0x00,0xc0,0x03,0x33,0x33,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xda,0xaa,0xa7,0xfe,0xa0,0xe0,0x0f,0xfe,0xa0,0xe0,0x0f,0xcc,0xcc,0xcf,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xfa,0xbf,0xff,0xff,0xfa,0xbf,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x2b,0xff,0xff,0xeb,0xdb,0xff,0xff,0xdb,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xff,0xff,0xfc,0x3f,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x8a,0xaa,0xaa,0x82,0x55,0x55,0x55,0x52,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xe5,0x55,0x55,0x5b,0xff,0xff,0xff,0xff,0x05,0x5f,0xfd,0x50,0x20,0x00,0x00,0x23,0xd0,0x00,0x00,0x13,0xa8,0xc0,0x0f,0xff,0xff,0xff,0xff,0xff,0xca,0xaa,0xaa,0xa3,0xea,0xaa,0xaa,0xab,0x15,0x6b,0xe9,0x64,0xc3,0xff,0xff,0xc3,0xe3,0xff,0xff,0xc3,0xa8,0xca,0x0c,0x0f,0xff,0xff,0xff,0xff,0xc8,0x22,0x20,0x23,0xdb,0xff,0xff,0xeb,0x66,0xa0,0xc2,0x99,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xa8,0xca,0x0c,0x0f,0xfc,0x00,0x00,0x3f,0xca,0xaa,0xaa,0xa3,0xdb,0x00,0x00,0x2b,0x9a,0x83,0x54,0xa5,0x3f,0xff,0xff,0xfe,0x0c,0xcc,0xcc,0xfc,0xa8,0xca,0x0c,0x0f,0xff,0xff,0xff,0xff,0xc8,0x80,0x20,0x23,0xdb,0xaa,0xaa,0x2b,0x22,0x0d,0x95,0x2a,0x0f,0xff,0xff,0xf8,0xa8,0xfc,0x00,0xff,0xa8,0xca,0x0c,0x0f,0xff,0xff,0xff,0xff,0xca,0xaa,0xaa,0xa3,0xd8,0x00,0x00,0x2b,0xc0,0x32,0x65,0x03,0x00,0x8a,0xaa,0xa0,0xff,0xfe,0x08,0xff,0xa8,0xca,0x0c,0x0f,0xf0,0x00,0x00,0x0f,0xff,0xff,0xff,0xff,0xd5,0x55,0x55,0x57,0xff,0xf2,0xa9,0x7f,0x2a,0xaa,0xaa,0xaa,0xaa,0xa8,0x00,0x00,0xa8,0xca,0x0c,0x0f,0xf2,0xaa,0xaa,0x8f,0x00,0x00,0xcf,0xcf,0xd0,0x00,0x00,0x07,0xf5,0x7c,0x2a,0x7c,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0xa8,0xca,0x0c,0x0f,0xf2,0xaa,0xaa,0x8f,0x00,0x00,0x13,0x13,0xe3,0xff,0xff,0xcb,0x39,0x57,0x02,0xb0,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0xa8,0xca,0x0c,0x0f,0xf0,0x00,0x00,0x0f,0x00,0x00,0x94,0x94,0xd2,0x00,0x00,0xcb,0x3a,0x65,0xd5,0x7c,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0xa8,0xca,0x0c,0x0f,0xff,0xff,0xff,0xff,0x00,0x00,0x13,0x13,0xe2,0x22,0x22,0xcb,0xca,0x99,0xd9,0x50,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0xc0,0x0c,0x0f,0xc0,0x00,0x00,0x03,0x00,0x00,0x2a,0xa3,0xe2,0x88,0x88,0xcb,0xc2,0xaa,0xca,0x64,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0xfc,0xcf,0xcc,0x0f,0xca,0xaa,0xaa,0xa3,0x00,0x00,0x20,0x23,0xe2,0xaa,0xaa,0xcb,0xc0,0x88,0xf2,0x98,0x80,0x00,0x03,0xc0,0x00,0x03,0x00,0x00,0xfc,0xff,0xcf,0xcf,0xca,0xaa,0xaa,0xa3,0x00,0x00,0x23,0x23,0xc0,0x00,0x00,0x03,0x30,0x03,0xfc,0x23,0x80,0x00,0x0c,0x30,0x00,0x03,0x00,0x00,0xff,0xff,0xff,0xff,0xca,0xaa,0xaa,0xa3,0x00,0x00,0xff,0xff,0x3f,0xff,0xff,0xfc,0xff,0xff,0xff,0xff,0x80,0x00,0x33,0x8c,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0xcc,0xa3,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xbf,0xff,0x30,0xa8,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0xc0,0xaa,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0xff,0x03,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xaa,0xaa,0x3f,0x0c,0xaa,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x8f,0x32,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x23,0xc8,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x08,0x20,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x02,0x80,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; \ No newline at end of file diff --git a/src/tools/genmap.js b/src/tools/genmap.js index 5b8ae03..5cf69e6 100644 --- a/src/tools/genmap.js +++ b/src/tools/genmap.js @@ -40,10 +40,18 @@ map.tilesets.forEach(tset => { }; } - if (tset.source.includes("Cave")) { + if (tset.source.includes("dungeon")) { tilesheet = { width: 14, - height: 5, + height: 13, + name: "Dungeon", + }; + } + + if (tset.source.includes("Cave")) { + tilesheet = { + width: 28, + height: 10, name: "Cave", } }