From 2570ad03096368d4174a78271f1c18aab59589ed Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Mon, 10 May 2021 00:47:05 -0400 Subject: [PATCH] Update test files for Tiled 1.6(still needs work) --- .../layer_tests/all_layer_types/map.json | 8 +- .../layer_tests/all_layer_types/tileset.json | 12 +- tests/test_data/layer_tests/b64/map.json | 6 +- tests/test_data/layer_tests/b64/tileset.json | 12 +- tests/test_data/layer_tests/b64_gzip/map.json | 6 +- .../layer_tests/b64_gzip/tileset.json | 12 +- tests/test_data/layer_tests/b64_zlib/map.json | 6 +- .../layer_tests/b64_zlib/tileset.json | 12 +- .../layer_tests/b64_zstd/expected.py | 109 ----- tests/test_data/layer_tests/b64_zstd/map.json | 13 +- .../layer_tests/b64_zstd/tileset.json | 34 +- .../layer_tests/infinite_map/map.json | 6 +- .../layer_tests/infinite_map_b64/map.json | 4 +- .../test_data/layer_tests/no_layers/map.json | 15 +- .../{tileset_image.json => tileset.json} | 6 +- .../map_tests/embedded_tileset/expected.py | 4 +- .../map_tests/embedded_tileset/map.json | 15 +- .../external_tileset_dif_dir/expected.py | 4 +- .../external_tileset_dif_dir/map.json | 6 +- .../tileset/tileset.json | 237 +++++------ .../test_data/map_tests/hexagonal/expected.py | 4 +- tests/test_data/map_tests/hexagonal/map.json | 4 +- .../map_tests/hexagonal/tileset.json | 4 +- .../map_tests/no_background_color/expected.py | 6 +- .../map_tests/no_background_color/map.json | 13 +- .../{tileset_image.json => tileset.json} | 6 +- .../test_data/map_tests/no_layers/expected.py | 8 +- tests/test_data/map_tests/no_layers/map.json | 15 +- .../{tileset_image.json => tileset.json} | 6 +- tests/test_data/tilesets/image/expected.py | 4 +- tests/test_data/tilesets/image/tileset.json | 12 +- .../image_background_color/expected.py | 4 +- .../image_background_color/tileset.json | 12 +- .../test_data/tilesets/image_grid/expected.py | 4 +- .../tilesets/image_grid/tileset.json | 54 +-- .../tilesets/image_properties/expected.py | 4 +- .../tilesets/image_properties/tileset.json | 6 +- .../tilesets/image_tile_offset/expected.py | 4 +- .../tilesets/image_tile_offset/tileset.json | 6 +- .../image_transparent_color/expected.py | 4 +- .../image_transparent_color/tileset.json | 12 +- .../tilesets/individual_images/expected.py | 4 +- .../tilesets/individual_images/tileset.json | 14 +- tests/test_data/tilesets/terrain/expected.py | 331 ++++----------- tests/test_data/tilesets/terrain/tileset.json | 388 +++++++++--------- tests/test_data/tilesets/wangsets/map.json | 4 +- .../test_data/tilesets/wangsets/tileset.json | 251 +---------- 47 files changed, 534 insertions(+), 1177 deletions(-) rename tests/test_data/layer_tests/no_layers/{tileset_image.json => tileset.json} (84%) rename tests/test_data/map_tests/no_background_color/{tileset_image.json => tileset.json} (84%) rename tests/test_data/map_tests/no_layers/{tileset_image.json => tileset.json} (84%) diff --git a/tests/test_data/layer_tests/all_layer_types/map.json b/tests/test_data/layer_tests/all_layer_types/map.json index 8d08251..f194b52 100644 --- a/tests/test_data/layer_tests/all_layer_types/map.json +++ b/tests/test_data/layer_tests/all_layer_types/map.json @@ -62,7 +62,7 @@ }, { "id":3, - "image":"..\/..\/images\/tile_04.png", + "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png", "name":"Image Layer 1", "opacity":1, "tintcolor":"#ff0000", @@ -74,7 +74,7 @@ }, { "id":5, - "image":"..\/..\/images\/tile_04.png", + "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png", "name":"Image Layer 2", "opacity":1, "parallaxx":1.5, @@ -88,7 +88,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.5.0", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -97,6 +97,6 @@ }], "tilewidth":32, "type":"map", - "version":1.5, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/all_layer_types/tileset.json b/tests/test_data/layer_tests/all_layer_types/tileset.json index 8df9f18..1a07451 100644 --- a/tests/test_data/layer_tests/all_layer_types/tileset.json +++ b/tests/test_data/layer_tests/all_layer_types/tileset.json @@ -1,12 +1,4 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, @@ -14,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64/map.json b/tests/test_data/layer_tests/b64/map.json index cdc7cd4..851cf76 100644 --- a/tests/test_data/layer_tests/b64/map.json +++ b/tests/test_data/layer_tests/b64/map.json @@ -50,7 +50,7 @@ }, { "id":3, - "image":"..\/..\/images\/tile_04.png", + "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png", "name":"Image Layer 1", "opacity":1, "transparentcolor":"#000000", @@ -63,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -72,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64/tileset.json b/tests/test_data/layer_tests/b64/tileset.json index 8df9f18..1a07451 100644 --- a/tests/test_data/layer_tests/b64/tileset.json +++ b/tests/test_data/layer_tests/b64/tileset.json @@ -1,12 +1,4 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, @@ -14,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_gzip/map.json b/tests/test_data/layer_tests/b64_gzip/map.json index eda44d8..536246e 100644 --- a/tests/test_data/layer_tests/b64_gzip/map.json +++ b/tests/test_data/layer_tests/b64_gzip/map.json @@ -50,7 +50,7 @@ }, { "id":3, - "image":"..\/..\/images\/tile_04.png", + "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png", "name":"Image Layer 1", "opacity":1, "transparentcolor":"#000000", @@ -63,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -72,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_gzip/tileset.json b/tests/test_data/layer_tests/b64_gzip/tileset.json index 8df9f18..1a07451 100644 --- a/tests/test_data/layer_tests/b64_gzip/tileset.json +++ b/tests/test_data/layer_tests/b64_gzip/tileset.json @@ -1,12 +1,4 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, @@ -14,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_zlib/map.json b/tests/test_data/layer_tests/b64_zlib/map.json index 5809c61..1597d1c 100644 --- a/tests/test_data/layer_tests/b64_zlib/map.json +++ b/tests/test_data/layer_tests/b64_zlib/map.json @@ -50,7 +50,7 @@ }, { "id":3, - "image":"..\/..\/images\/tile_04.png", + "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png", "name":"Image Layer 1", "opacity":1, "transparentcolor":"#000000", @@ -63,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -72,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_zlib/tileset.json b/tests/test_data/layer_tests/b64_zlib/tileset.json index 8df9f18..1a07451 100644 --- a/tests/test_data/layer_tests/b64_zlib/tileset.json +++ b/tests/test_data/layer_tests/b64_zlib/tileset.json @@ -1,12 +1,4 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, @@ -14,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_zstd/expected.py b/tests/test_data/layer_tests/b64_zstd/expected.py index 178924b..e69de29 100644 --- a/tests/test_data/layer_tests/b64_zstd/expected.py +++ b/tests/test_data/layer_tests/b64_zstd/expected.py @@ -1,109 +0,0 @@ -from pathlib import Path - -from pytiled_parser import common_types, layer, tiled_object - -EXPECTED = [ - layer.TileLayer( - name="Tile Layer 1", - opacity=1, - visible=True, - id=1, - size=common_types.Size(8, 6), - data=[ - [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - ], - [ - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - ], - [ - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - ], - [ - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - ], - [ - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - ], - [ - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48, - ], - ], - ), - layer.LayerGroup( - name="Group 1", - opacity=1, - visible=True, - id=4, - layers=[ - layer.ObjectLayer( - name="Object Layer 1", - opacity=1, - visible=True, - id=2, - draw_order="topdown", - tiled_objects=[ - tiled_object.Rectangle( - id=1, - name="", - rotation=0, - size=common_types.Size(69.3333333333333, 52.6666666666667), - coordinates=common_types.OrderedPair(46.3333333333333, 39), - visible=True, - type="", - ) - ], - ), - ], - ), - layer.ImageLayer( - name="Image Layer 1", - opacity=1, - visible=True, - id=3, - image=Path("../../images/tile_04.png"), - transparent_color=common_types.Color(0, 0, 0, 255), - ), -] diff --git a/tests/test_data/layer_tests/b64_zstd/map.json b/tests/test_data/layer_tests/b64_zstd/map.json index db069f7..f8e714d 100644 --- a/tests/test_data/layer_tests/b64_zstd/map.json +++ b/tests/test_data/layer_tests/b64_zstd/map.json @@ -1,11 +1,4 @@ { "compressionlevel":-1, - "editorsettings": - { - "export": - { - "target":"." - } - }, "height":6, "infinite":false, "layers":[ @@ -57,7 +50,7 @@ }, { "id":3, - "image":"..\/..\/images\/tile_04.png", + "image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png", "name":"Image Layer 1", "opacity":1, "transparentcolor":"#000000", @@ -70,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.3", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -79,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_zstd/tileset.json b/tests/test_data/layer_tests/b64_zstd/tileset.json index d6531d4..1a07451 100644 --- a/tests/test_data/layer_tests/b64_zstd/tileset.json +++ b/tests/test_data/layer_tests/b64_zstd/tileset.json @@ -1,22 +1,14 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, - "image":"..\/..\/images\/tmw_desert_spacing.png", - "imageheight":199, - "imagewidth":265, - "margin":1, - "name":"tile_set_image", - "spacing":1, - "tilecount":48, - "tiledversion":"1.3.5", - "tileheight":32, - "tilewidth":32, - "type":"tileset", - "version":1.2 - } \ No newline at end of file + "image":"..\/..\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "spacing":1, + "tilecount":48, + "tiledversion":"1.6.0", + "tileheight":32, + "tilewidth":32, + "type":"tileset", + "version":"1.6" +} \ No newline at end of file diff --git a/tests/test_data/layer_tests/infinite_map/map.json b/tests/test_data/layer_tests/infinite_map/map.json index f506453..b6c2aca 100644 --- a/tests/test_data/layer_tests/infinite_map/map.json +++ b/tests/test_data/layer_tests/infinite_map/map.json @@ -8,7 +8,7 @@ }, "export": { - "target":"..\/all_layer_types" + "target":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/all_layer_types" } }, "height":6, @@ -54,7 +54,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -63,6 +63,6 @@ }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/infinite_map_b64/map.json b/tests/test_data/layer_tests/infinite_map_b64/map.json index 54c3852..8c3f26f 100644 --- a/tests/test_data/layer_tests/infinite_map_b64/map.json +++ b/tests/test_data/layer_tests/infinite_map_b64/map.json @@ -37,7 +37,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -46,6 +46,6 @@ }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/no_layers/map.json b/tests/test_data/layer_tests/no_layers/map.json index ac423c0..2fa7062 100644 --- a/tests/test_data/layer_tests/no_layers/map.json +++ b/tests/test_data/layer_tests/no_layers/map.json @@ -1,11 +1,4 @@ { "compressionlevel":0, - "editorsettings": - { - "export": - { - "target":"." - } - }, "height":6, "infinite":false, "layers":[], @@ -31,7 +24,7 @@ { "name":"file property", "type":"file", - "value":"..\/..\/..\/..\/..\/..\/var\/log\/syslog" + "value":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/var\/log\/syslog" }, { "name":"float property", @@ -49,15 +42,15 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { "firstgid":1, - "source":"tileset_image.json" + "source":"tileset.json" }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/no_layers/tileset_image.json b/tests/test_data/layer_tests/no_layers/tileset.json similarity index 84% rename from tests/test_data/layer_tests/no_layers/tileset_image.json rename to tests/test_data/layer_tests/no_layers/tileset.json index e88a3f1..1a07451 100644 --- a/tests/test_data/layer_tests/no_layers/tileset_image.json +++ b/tests/test_data/layer_tests/no_layers/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.1", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 -} + "version":"1.6" +} \ No newline at end of file diff --git a/tests/test_data/map_tests/embedded_tileset/expected.py b/tests/test_data/map_tests/embedded_tileset/expected.py index cbabb9c..d8988d9 100644 --- a/tests/test_data/map_tests/embedded_tileset/expected.py +++ b/tests/test_data/map_tests/embedded_tileset/expected.py @@ -10,9 +10,9 @@ EXPECTED = tiled_map.TiledMap( next_object_id=1, orientation="orthogonal", render_order="right-down", - tiled_version="1.4.1", + tiled_version="1.6.0", tile_size=common_types.Size(32, 32), - version=1.4, + version="1.6", tilesets={ 1: tileset.Tileset( columns=8, diff --git a/tests/test_data/map_tests/embedded_tileset/map.json b/tests/test_data/map_tests/embedded_tileset/map.json index 7d247c1..aea2adc 100644 --- a/tests/test_data/map_tests/embedded_tileset/map.json +++ b/tests/test_data/map_tests/embedded_tileset/map.json @@ -1,11 +1,4 @@ { "compressionlevel":0, - "editorsettings": - { - "export": - { - "target":"." - } - }, "height":6, "infinite":false, "layers":[], @@ -13,24 +6,24 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { "columns":8, "firstgid":1, - "image":"..\/..\/images\/tmw_desert_spacing.png", + "image":"..\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, "name":"tileset", "spacing":1, - "tilecount":48, + "tilecount":0, "tileheight":32, "tilewidth":32 }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py index 98f15a3..32d91d5 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py +++ b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py @@ -9,9 +9,9 @@ EXPECTED = tiled_map.TiledMap( next_object_id=1, orientation="orthogonal", render_order="right-down", - tiled_version="1.5.0", + tiled_version="1.6.0", tile_size=common_types.Size(32, 32), - version=1.5, + version="1.6", background_color=common_types.Color(255, 0, 4, 255), layers=[ layer.TileLayer( diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/map.json b/tests/test_data/map_tests/external_tileset_dif_dir/map.json index 3a4be3c..fbe659a 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/map.json +++ b/tests/test_data/map_tests/external_tileset_dif_dir/map.json @@ -34,7 +34,7 @@ { "name":"file property", "type":"file", - "value":"..\/..\/..\/..\/..\/..\/var\/log\/syslog" + "value":"..\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/var\/log\/syslog" }, { "name":"float property", @@ -52,7 +52,7 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.5.0", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -61,6 +61,6 @@ }], "tilewidth":32, "type":"map", - "version":1.5, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json index 323dca4..dd51f38 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json +++ b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json @@ -1,124 +1,115 @@ { "columns":0, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, - "grid": - { - "height":1, - "orientation":"orthogonal", - "width":1 - }, - "margin":0, - "name":"tileset", - "spacing":0, - "tilecount":4, - "tiledversion":"1.3.5", - "tileheight":32, - "tiles":[ - { - "animation":[ - { - "duration":100, - "tileid":0 - }, - { - "duration":100, - "tileid":1 - }, - { - "duration":100, - "tileid":2 - }, - { - "duration":100, - "tileid":3 - }], - "id":0, - "image":"..\/..\/..\/images\/tile_01.png", - "imageheight":32, - "imagewidth":32, - "properties":[ - { - "name":"float property", - "type":"float", - "value":2.2 - }], - "type":"tile" - }, - { - "id":1, - "image":"..\/..\/..\/images\/tile_02.png", - "imageheight":32, - "imagewidth":32, - "objectgroup": - { - "draworder":"index", - "name":"", - "objects":[ - { - "height":13.7196924896511, - "id":2, - "name":"", - "rotation":0, - "type":"", - "visible":true, - "width":14.4766410408043, - "x":13.4358367829687, - "y":13.5304553518628 - }, - { - "ellipse":true, - "height":11.070372560615, - "id":3, - "name":"", - "rotation":0, - "type":"", - "visible":true, - "width":14.287403903016, - "x":13.8143110585452, - "y":1.98698994677705 - }], - "opacity":1, - "type":"objectgroup", - "visible":true, - "x":0, - "y":0 - }, - "properties":[ - { - "name":"string property", - "type":"string", - "value":"testing" - }], - "type":"tile" - }, - { - "id":2, - "image":"..\/..\/..\/images\/tile_03.png", - "imageheight":32, - "imagewidth":32, - "properties":[ - { - "name":"bool property", - "type":"bool", - "value":true - }], - "type":"tile" - }, - { - "id":3, - "image":"..\/..\/..\/images\/tile_04.png", - "imageheight":32, - "imagewidth":32, - "type":"tile" - }], - "tilewidth":32, - "type":"tileset", - "version":1.2 - } - \ No newline at end of file + "grid": + { + "height":1, + "orientation":"orthogonal", + "width":1 + }, + "margin":0, + "name":"tileset", + "spacing":0, + "tilecount":4, + "tiledversion":"1.6.0", + "tileheight":32, + "tiles":[ + { + "animation":[ + { + "duration":100, + "tileid":0 + }, + { + "duration":100, + "tileid":1 + }, + { + "duration":100, + "tileid":2 + }, + { + "duration":100, + "tileid":3 + }], + "id":0, + "image":"..\/..\/..\/images\/tile_01.png", + "imageheight":32, + "imagewidth":32, + "properties":[ + { + "name":"float property", + "type":"float", + "value":2.2 + }], + "type":"tile" + }, + { + "id":1, + "image":"..\/..\/..\/images\/tile_02.png", + "imageheight":32, + "imagewidth":32, + "objectgroup": + { + "draworder":"index", + "name":"", + "objects":[ + { + "height":13.7196924896511, + "id":2, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":14.4766410408043, + "x":13.4358367829687, + "y":13.5304553518628 + }, + { + "ellipse":true, + "height":11.070372560615, + "id":3, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":14.287403903016, + "x":13.8143110585452, + "y":1.98698994677705 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + "properties":[ + { + "name":"string property", + "type":"string", + "value":"testing" + }], + "type":"tile" + }, + { + "id":2, + "image":"..\/..\/..\/images\/tile_03.png", + "imageheight":32, + "imagewidth":32, + "properties":[ + { + "name":"bool property", + "type":"bool", + "value":true + }], + "type":"tile" + }, + { + "id":3, + "image":"..\/..\/..\/images\/tile_04.png", + "imageheight":32, + "imagewidth":32, + "type":"tile" + }], + "tilewidth":32, + "type":"tileset", + "version":"1.6" +} \ No newline at end of file diff --git a/tests/test_data/map_tests/hexagonal/expected.py b/tests/test_data/map_tests/hexagonal/expected.py index 38fdcb9..c478862 100644 --- a/tests/test_data/map_tests/hexagonal/expected.py +++ b/tests/test_data/map_tests/hexagonal/expected.py @@ -132,9 +132,9 @@ EXPECTED = tiled_map.TiledMap( next_object_id=1, orientation="hexagonal", render_order="right-down", - tiled_version="1.4.1", + tiled_version="1.6.0", tile_size=common_types.Size(14, 12), - version=1.4, + version="1.6", tilesets={ 1: tileset.Tileset( columns=5, diff --git a/tests/test_data/map_tests/hexagonal/map.json b/tests/test_data/map_tests/hexagonal/map.json index 847f382..17f6352 100644 --- a/tests/test_data/map_tests/hexagonal/map.json +++ b/tests/test_data/map_tests/hexagonal/map.json @@ -21,7 +21,7 @@ "renderorder":"right-down", "staggeraxis":"y", "staggerindex":"odd", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":12, "tilesets":[ { @@ -30,6 +30,6 @@ }], "tilewidth":14, "type":"map", - "version":1.4, + "version":"1.6", "width":10 } \ No newline at end of file diff --git a/tests/test_data/map_tests/hexagonal/tileset.json b/tests/test_data/map_tests/hexagonal/tileset.json index be8e7b4..b6bec3c 100644 --- a/tests/test_data/map_tests/hexagonal/tileset.json +++ b/tests/test_data/map_tests/hexagonal/tileset.json @@ -6,7 +6,7 @@ "name":"tileset", "spacing":0, "tilecount":20, - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":18, "tileoffset": { @@ -15,5 +15,5 @@ }, "tilewidth":18, "type":"tileset", - "version":1.4 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/map_tests/no_background_color/expected.py b/tests/test_data/map_tests/no_background_color/expected.py index 4c34f58..4eed352 100644 --- a/tests/test_data/map_tests/no_background_color/expected.py +++ b/tests/test_data/map_tests/no_background_color/expected.py @@ -10,9 +10,9 @@ EXPECTED = tiled_map.TiledMap( next_object_id=1, orientation="orthogonal", render_order="right-down", - tiled_version="1.4.1", + tiled_version="1.6.0", tile_size=common_types.Size(32, 32), - version=1.4, + version="1.6", tilesets={ 1: tileset.Tileset( columns=8, @@ -28,7 +28,7 @@ EXPECTED = tiled_map.TiledMap( tiled_version="1.3.1", tile_height=32, tile_width=32, - version=1.2, + version="1.6.0", type="tileset", ) }, diff --git a/tests/test_data/map_tests/no_background_color/map.json b/tests/test_data/map_tests/no_background_color/map.json index 124e37e..8e2a2d6 100644 --- a/tests/test_data/map_tests/no_background_color/map.json +++ b/tests/test_data/map_tests/no_background_color/map.json @@ -1,11 +1,4 @@ { "compressionlevel":0, - "editorsettings": - { - "export": - { - "target":"." - } - }, "height":6, "infinite":false, "layers":[], @@ -13,15 +6,15 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { "firstgid":1, - "source":"tileset_image.json" + "source":"tileset.json" }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/no_background_color/tileset_image.json b/tests/test_data/map_tests/no_background_color/tileset.json similarity index 84% rename from tests/test_data/map_tests/no_background_color/tileset_image.json rename to tests/test_data/map_tests/no_background_color/tileset.json index e88a3f1..1a07451 100644 --- a/tests/test_data/map_tests/no_background_color/tileset_image.json +++ b/tests/test_data/map_tests/no_background_color/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.1", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 -} + "version":"1.6" +} \ No newline at end of file diff --git a/tests/test_data/map_tests/no_layers/expected.py b/tests/test_data/map_tests/no_layers/expected.py index 1324cab..7bc5ca2 100644 --- a/tests/test_data/map_tests/no_layers/expected.py +++ b/tests/test_data/map_tests/no_layers/expected.py @@ -10,9 +10,9 @@ EXPECTED = tiled_map.TiledMap( next_object_id=1, orientation="orthogonal", render_order="right-down", - tiled_version="1.4.1", + tiled_version="1.6.0", tile_size=common_types.Size(32, 32), - version=1.4, + version="1.6", background_color=common_types.Color(255, 0, 4, 255), tilesets={ 1: tileset.Tileset( @@ -26,10 +26,10 @@ EXPECTED = tiled_map.TiledMap( spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.1", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", type="tileset", ) }, diff --git a/tests/test_data/map_tests/no_layers/map.json b/tests/test_data/map_tests/no_layers/map.json index 0c35133..7fd5914 100644 --- a/tests/test_data/map_tests/no_layers/map.json +++ b/tests/test_data/map_tests/no_layers/map.json @@ -1,12 +1,5 @@ { "backgroundcolor":"#ff0004", "compressionlevel":0, - "editorsettings": - { - "export": - { - "target":"." - } - }, "height":6, "infinite":false, "layers":[], @@ -27,7 +20,7 @@ { "name":"file property", "type":"file", - "value":"..\/..\/..\/..\/..\/..\/var\/log\/syslog" + "value":"..\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/test_data\/map_tests\/tests\/var\/log\/syslog" }, { "name":"float property", @@ -45,15 +38,15 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.4.1", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { "firstgid":1, - "source":"tileset_image.json" + "source":"tileset.json" }], "tilewidth":32, "type":"map", - "version":1.4, + "version":"1.6", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/no_layers/tileset_image.json b/tests/test_data/map_tests/no_layers/tileset.json similarity index 84% rename from tests/test_data/map_tests/no_layers/tileset_image.json rename to tests/test_data/map_tests/no_layers/tileset.json index e88a3f1..1a07451 100644 --- a/tests/test_data/map_tests/no_layers/tileset_image.json +++ b/tests/test_data/map_tests/no_layers/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.1", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 -} + "version":"1.6" +} \ No newline at end of file diff --git a/tests/test_data/tilesets/image/expected.py b/tests/test_data/tilesets/image/expected.py index 62577e5..8f5b730 100644 --- a/tests/test_data/tilesets/image/expected.py +++ b/tests/test_data/tilesets/image/expected.py @@ -11,9 +11,9 @@ EXPECTED = tileset.Tileset( spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", type="tileset", ) diff --git a/tests/test_data/tilesets/image/tileset.json b/tests/test_data/tilesets/image/tileset.json index 8df9f18..1a07451 100644 --- a/tests/test_data/tilesets/image/tileset.json +++ b/tests/test_data/tilesets/image/tileset.json @@ -1,12 +1,4 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, @@ -14,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_background_color/expected.py b/tests/test_data/tilesets/image_background_color/expected.py index 3316c75..7b322ad 100644 --- a/tests/test_data/tilesets/image_background_color/expected.py +++ b/tests/test_data/tilesets/image_background_color/expected.py @@ -12,10 +12,10 @@ EXPECTED = tileset.Tileset( spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", background_color=Color(85, 0, 255, 255), type="tileset", ) diff --git a/tests/test_data/tilesets/image_background_color/tileset.json b/tests/test_data/tilesets/image_background_color/tileset.json index 83ae8dd..db8b40f 100644 --- a/tests/test_data/tilesets/image_background_color/tileset.json +++ b/tests/test_data/tilesets/image_background_color/tileset.json @@ -1,13 +1,5 @@ { "backgroundcolor":"#5500ff", "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, @@ -15,9 +7,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_grid/expected.py b/tests/test_data/tilesets/image_grid/expected.py index 1d58174..0369112 100644 --- a/tests/test_data/tilesets/image_grid/expected.py +++ b/tests/test_data/tilesets/image_grid/expected.py @@ -11,10 +11,10 @@ EXPECTED = tileset.Tileset( spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", grid=tileset.Grid(orientation="isometric", width=32, height=32), type="tileset", ) diff --git a/tests/test_data/tilesets/image_grid/tileset.json b/tests/test_data/tilesets/image_grid/tileset.json index 4afdde1..7bcbf1e 100644 --- a/tests/test_data/tilesets/image_grid/tileset.json +++ b/tests/test_data/tilesets/image_grid/tileset.json @@ -1,26 +1,28 @@ -{ - "columns": 8, - "editorsettings": { - "export": { - "format": "", - "target": "../image" - } - }, - "grid": { - "height": 32, - "orientation": "isometric", - "width": 32 - }, - "image": "../../images/tmw_desert_spacing.png", - "imageheight": 199, - "imagewidth": 265, - "margin": 1, - "name": "tile_set_image", - "spacing": 1, - "tilecount": 48, - "tiledversion": "1.3.5", - "tileheight": 32, - "tilewidth": 32, - "type": "tileset", - "version": 1.2 -} +{ "columns":8, + "editorsettings": + { + "export": + { + "format":"", + "target":"..\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/image" + } + }, + "grid": + { + "height":32, + "orientation":"isometric", + "width":32 + }, + "image":"..\/..\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "spacing":1, + "tilecount":48, + "tiledversion":"1.6.0", + "tileheight":32, + "tilewidth":32, + "type":"tileset", + "version":"1.6" +} \ No newline at end of file diff --git a/tests/test_data/tilesets/image_properties/expected.py b/tests/test_data/tilesets/image_properties/expected.py index 6c34158..d756b2b 100644 --- a/tests/test_data/tilesets/image_properties/expected.py +++ b/tests/test_data/tilesets/image_properties/expected.py @@ -12,10 +12,10 @@ EXPECTED = tileset.Tileset( spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", properties={ "bool property": True, "color property": Color(255, 0, 0, 255), diff --git a/tests/test_data/tilesets/image_properties/tileset.json b/tests/test_data/tilesets/image_properties/tileset.json index a5aa95b..3a698fa 100644 --- a/tests/test_data/tilesets/image_properties/tileset.json +++ b/tests/test_data/tilesets/image_properties/tileset.json @@ -4,7 +4,7 @@ "export": { "format":"", - "target":"..\/image" + "target":"..\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/image" } }, "image":"..\/..\/images\/tmw_desert_spacing.png", @@ -40,9 +40,9 @@ }], "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_tile_offset/expected.py b/tests/test_data/tilesets/image_tile_offset/expected.py index 97e2777..b67716e 100644 --- a/tests/test_data/tilesets/image_tile_offset/expected.py +++ b/tests/test_data/tilesets/image_tile_offset/expected.py @@ -12,10 +12,10 @@ EXPECTED = tileset.Tileset( spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", tile_offset=OrderedPair(3, 5), type="tileset", ) diff --git a/tests/test_data/tilesets/image_tile_offset/tileset.json b/tests/test_data/tilesets/image_tile_offset/tileset.json index 61e3017..5e0e99a 100644 --- a/tests/test_data/tilesets/image_tile_offset/tileset.json +++ b/tests/test_data/tilesets/image_tile_offset/tileset.json @@ -4,7 +4,7 @@ "export": { "format":"", - "target":"..\/image" + "target":"..\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/tests\/test_data\/tilesets\/image" } }, "image":"..\/..\/images\/tmw_desert_spacing.png", @@ -14,7 +14,7 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tileoffset": { @@ -23,5 +23,5 @@ }, "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_transparent_color/expected.py b/tests/test_data/tilesets/image_transparent_color/expected.py index 758747f..7f31fa3 100644 --- a/tests/test_data/tilesets/image_transparent_color/expected.py +++ b/tests/test_data/tilesets/image_transparent_color/expected.py @@ -12,10 +12,10 @@ EXPECTED = tileset.Tileset( spacing=1, name="tileset", tile_count=48, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", transparent_color=Color(255, 0, 255, 255), type="tileset", ) diff --git a/tests/test_data/tilesets/image_transparent_color/tileset.json b/tests/test_data/tilesets/image_transparent_color/tileset.json index fe318c3..a6f17d7 100644 --- a/tests/test_data/tilesets/image_transparent_color/tileset.json +++ b/tests/test_data/tilesets/image_transparent_color/tileset.json @@ -1,12 +1,4 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, @@ -14,10 +6,10 @@ "name":"tileset", "spacing":1, "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "transparentcolor":"#ff00ff", "type":"tileset", - "version":1.2 + "version":"1.6" } \ No newline at end of file diff --git a/tests/test_data/tilesets/individual_images/expected.py b/tests/test_data/tilesets/individual_images/expected.py index 63d766f..ef98758 100644 --- a/tests/test_data/tilesets/individual_images/expected.py +++ b/tests/test_data/tilesets/individual_images/expected.py @@ -8,10 +8,10 @@ EXPECTED = tileset.Tileset( spacing=0, name="tileset", tile_count=4, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", type="tileset", grid=tileset.Grid(orientation="orthogonal", width=1, height=1), tiles={ diff --git a/tests/test_data/tilesets/individual_images/tileset.json b/tests/test_data/tilesets/individual_images/tileset.json index a22186e..fdadc85 100644 --- a/tests/test_data/tilesets/individual_images/tileset.json +++ b/tests/test_data/tilesets/individual_images/tileset.json @@ -1,12 +1,4 @@ { "columns":0, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "grid": { "height":1, @@ -17,7 +9,7 @@ "name":"tileset", "spacing":0, "tilecount":4, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tiles":[ { @@ -119,5 +111,5 @@ }], "tilewidth":32, "type":"tileset", - "version":1.2 -} + "version":"1.6" +} \ No newline at end of file diff --git a/tests/test_data/tilesets/terrain/expected.py b/tests/test_data/tilesets/terrain/expected.py index c5902eb..ce71f8c 100644 --- a/tests/test_data/tilesets/terrain/expected.py +++ b/tests/test_data/tilesets/terrain/expected.py @@ -1,6 +1,6 @@ from pathlib import Path -from pytiled_parser import common_types, layer, tileset +from pytiled_parser import common_types, tileset, wang_set EXPECTED = tileset.Tileset( columns=8, @@ -11,261 +11,84 @@ EXPECTED = tileset.Tileset( image_height=199, image_width=265, tile_count=48, - tiled_version="1.3.5", + tiled_version="1.6.0", tile_height=32, tile_width=32, - version=1.2, + version="1.6", type="tileset", - terrain_types=[ - tileset.Terrain( - name="Sand", - tile=29, - properties={"terrain property": "test terrain property"}, - ), - tileset.Terrain(name="Cobblestone", tile=29), - tileset.Terrain(name="Pavement", tile=29), - tileset.Terrain(name="Dirt", tile=29), + wang_sets=[ + wang_set.WangSet( + name="Terrains", + tile=-1, + wang_type="mixed", + wang_colors=[ + wang_set.WangColor( + name="Sand", + probability=1, + tile=-1, + color=common_types.Color(255, 0, 0, 255), + ), + wang_set.WangColor( + name="Cobblestone", + probability=1, + tile=-1, + color=common_types.Color(0, 255, 0, 255), + ), + wang_set.WangColor( + name="Pavement", + probability=1, + tile=-1, + color=common_types.Color(0, 0, 255, 255), + ), + wang_set.WangColor( + name="Dirt", + probability=1, + tile=-1, + color=common_types.Color(255, 119, 0, 255), + ), + ], + wang_tiles={ + 0: wang_set.WangTile(tile_id=0, wang_id=[1, 1, 0, 2, 0, 1, 1, 1]), + 1: wang_set.WangTile(tile_id=1, wang_id=[1, 1, 0, 2, 2, 2, 0, 1]), + 2: wang_set.WangTile(tile_id=2, wang_id=[1, 1, 1, 1, 0, 2, 0, 1]), + 3: wang_set.WangTile(tile_id=3, wang_id=[4, 4, 0, 1, 0, 4, 4, 4]), + 4: wang_set.WangTile(tile_id=4, wang_id=[4, 4, 4, 4, 0, 1, 0, 4]), + 5: wang_set.WangTile(tile_id=5, wang_id=[1, 1, 0, 4, 0, 1, 1, 1]), + 6: wang_set.WangTile(tile_id=6, wang_id=[1, 1, 0, 4, 4, 4, 0, 1]), + 7: wang_set.WangTile(tile_id=7, wang_id=[1, 1, 1, 1, 0, 4, 0, 1]), + 8: wang_set.WangTile(tile_id=8, wang_id=[0, 2, 2, 2, 0, 1, 1, 1]), + 9: wang_set.WangTile(tile_id=9, wang_id=[2, 2, 2, 2, 2, 2, 2, 2]), + 10: wang_set.WangTile(tile_id=10, wang_id=[0, 1, 1, 1, 0, 2, 2, 2]), + 11: wang_set.WangTile(tile_id=11, wang_id=[0, 1, 0, 4, 4, 4, 4, 4]), + 12: wang_set.WangTile(tile_id=12, wang_id=[0, 4, 4, 4, 4, 4, 0, 1]), + 13: wang_set.WangTile(tile_id=13, wang_id=[0, 4, 4, 4, 0, 1, 1, 1]), + 14: wang_set.WangTile(tile_id=14, wang_id=[4, 4, 4, 4, 4, 4, 4, 4]), + 15: wang_set.WangTile(tile_id=15, wang_id=[0, 1, 1, 1, 0, 4, 4, 4]), + 16: wang_set.WangTile(tile_id=16, wang_id=[0, 2, 0, 1, 1, 1, 1, 1]), + 17: wang_set.WangTile(tile_id=17, wang_id=[2, 2, 0, 1, 1, 1, 0, 2]), + 18: wang_set.WangTile(tile_id=18, wang_id=[0, 1, 1, 1, 1, 1, 0, 2]), + 19: wang_set.WangTile(tile_id=19, wang_id=[2, 2, 0, 1, 0, 2, 2, 2]), + 20: wang_set.WangTile(tile_id=20, wang_id=[2, 2, 2, 2, 0, 1, 0, 2]), + 21: wang_set.WangTile(tile_id=21, wang_id=[0, 4, 0, 1, 1, 1, 1, 1]), + 22: wang_set.WangTile(tile_id=22, wang_id=[4, 4, 0, 1, 1, 1, 0, 4]), + 23: wang_set.WangTile(tile_id=23, wang_id=[0, 1, 1, 1, 1, 1, 0, 4]), + 24: wang_set.WangTile(tile_id=24, wang_id=[1, 1, 0, 3, 0, 1, 1, 1]), + 25: wang_set.WangTile(tile_id=25, wang_id=[1, 1, 0, 3, 3, 3, 0, 1]), + 26: wang_set.WangTile(tile_id=26, wang_id=[1, 1, 1, 1, 0, 3, 0, 1]), + 27: wang_set.WangTile(tile_id=27, wang_id=[0, 1, 0, 2, 2, 2, 2, 2]), + 28: wang_set.WangTile(tile_id=28, wang_id=[0, 2, 2, 2, 2, 2, 0, 1]), + 29: wang_set.WangTile(tile_id=29, wang_id=[1, 1, 1, 1, 1, 1, 1, 1]), + 32: wang_set.WangTile(tile_id=32, wang_id=[0, 3, 3, 3, 0, 1, 1, 1]), + 33: wang_set.WangTile(tile_id=33, wang_id=[3, 3, 3, 3, 3, 3, 3, 3]), + 34: wang_set.WangTile(tile_id=34, wang_id=[0, 1, 1, 1, 0, 3, 3, 3]), + 35: wang_set.WangTile(tile_id=35, wang_id=[3, 3, 0, 1, 0, 3, 3, 3]), + 36: wang_set.WangTile(tile_id=36, wang_id=[3, 3, 3, 3, 0, 1, 0, 3]), + 40: wang_set.WangTile(tile_id=40, wang_id=[0, 3, 0, 1, 1, 1, 1, 1]), + 41: wang_set.WangTile(tile_id=41, wang_id=[3, 3, 0, 1, 1, 1, 0, 3]), + 42: wang_set.WangTile(tile_id=42, wang_id=[0, 1, 1, 1, 1, 1, 0, 3]), + 43: wang_set.WangTile(tile_id=43, wang_id=[0, 1, 0, 3, 3, 3, 3, 3]), + 44: wang_set.WangTile(tile_id=44, wang_id=[0, 3, 3, 3, 3, 3, 0, 1]), + }, + ) ], - tiles={ - 0: tileset.Tile( - id=0, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=0, bottom_right=1 - ), - ), - 1: tileset.Tile( - id=1, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=1, bottom_right=1 - ), - ), - 2: tileset.Tile( - id=2, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=1, bottom_right=0 - ), - ), - 3: tileset.Tile( - id=3, - terrain=tileset.TileTerrain( - top_left=3, top_right=3, bottom_left=3, bottom_right=0 - ), - ), - 4: tileset.Tile( - id=4, - terrain=tileset.TileTerrain( - top_left=3, top_right=3, bottom_left=0, bottom_right=3 - ), - ), - 5: tileset.Tile( - id=5, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=0, bottom_right=3 - ), - ), - 6: tileset.Tile( - id=6, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=3, bottom_right=3 - ), - ), - 7: tileset.Tile( - id=7, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=3, bottom_right=0 - ), - ), - 8: tileset.Tile( - id=8, - terrain=tileset.TileTerrain( - top_left=0, top_right=1, bottom_left=0, bottom_right=1 - ), - ), - 9: tileset.Tile( - id=9, - terrain=tileset.TileTerrain( - top_left=1, top_right=1, bottom_left=1, bottom_right=1 - ), - ), - 10: tileset.Tile( - id=10, - terrain=tileset.TileTerrain( - top_left=1, top_right=0, bottom_left=1, bottom_right=0 - ), - ), - 11: tileset.Tile( - id=11, - terrain=tileset.TileTerrain( - top_left=3, top_right=0, bottom_left=3, bottom_right=3 - ), - ), - 12: tileset.Tile( - id=12, - terrain=tileset.TileTerrain( - top_left=0, top_right=3, bottom_left=3, bottom_right=3 - ), - ), - 13: tileset.Tile( - id=13, - terrain=tileset.TileTerrain( - top_left=0, top_right=3, bottom_left=0, bottom_right=3 - ), - ), - 14: tileset.Tile( - id=14, - terrain=tileset.TileTerrain( - top_left=3, top_right=3, bottom_left=3, bottom_right=3 - ), - ), - 15: tileset.Tile( - id=15, - terrain=tileset.TileTerrain( - top_left=3, top_right=0, bottom_left=3, bottom_right=0 - ), - ), - 16: tileset.Tile( - id=16, - terrain=tileset.TileTerrain( - top_left=0, top_right=1, bottom_left=0, bottom_right=0 - ), - ), - 17: tileset.Tile( - id=17, - terrain=tileset.TileTerrain( - top_left=1, top_right=1, bottom_left=0, bottom_right=0 - ), - ), - 18: tileset.Tile( - id=18, - terrain=tileset.TileTerrain( - top_left=1, top_right=0, bottom_left=0, bottom_right=0 - ), - ), - 19: tileset.Tile( - id=19, - terrain=tileset.TileTerrain( - top_left=1, top_right=1, bottom_left=1, bottom_right=0 - ), - ), - 20: tileset.Tile( - id=20, - terrain=tileset.TileTerrain( - top_left=1, top_right=1, bottom_left=0, bottom_right=1 - ), - ), - 21: tileset.Tile( - id=21, - terrain=tileset.TileTerrain( - top_left=0, top_right=3, bottom_left=0, bottom_right=0 - ), - ), - 22: tileset.Tile( - id=22, - terrain=tileset.TileTerrain( - top_left=3, top_right=3, bottom_left=0, bottom_right=0 - ), - ), - 23: tileset.Tile( - id=23, - terrain=tileset.TileTerrain( - top_left=3, top_right=0, bottom_left=0, bottom_right=0 - ), - ), - 24: tileset.Tile( - id=24, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=0, bottom_right=2 - ), - ), - 25: tileset.Tile( - id=25, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=2, bottom_right=2 - ), - ), - 26: tileset.Tile( - id=26, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=2, bottom_right=0 - ), - ), - 27: tileset.Tile( - id=27, - terrain=tileset.TileTerrain( - top_left=1, top_right=0, bottom_left=1, bottom_right=1 - ), - ), - 28: tileset.Tile( - id=28, - terrain=tileset.TileTerrain( - top_left=0, top_right=1, bottom_left=1, bottom_right=1 - ), - ), - 29: tileset.Tile( - id=29, - terrain=tileset.TileTerrain( - top_left=0, top_right=0, bottom_left=0, bottom_right=0 - ), - ), - 32: tileset.Tile( - id=32, - terrain=tileset.TileTerrain( - top_left=0, top_right=2, bottom_left=0, bottom_right=2 - ), - ), - 33: tileset.Tile( - id=33, - terrain=tileset.TileTerrain( - top_left=2, top_right=2, bottom_left=2, bottom_right=2 - ), - ), - 34: tileset.Tile( - id=34, - terrain=tileset.TileTerrain( - top_left=2, top_right=0, bottom_left=2, bottom_right=0 - ), - ), - 35: tileset.Tile( - id=35, - terrain=tileset.TileTerrain( - top_left=2, top_right=2, bottom_left=2, bottom_right=0 - ), - ), - 36: tileset.Tile( - id=36, - terrain=tileset.TileTerrain( - top_left=2, top_right=2, bottom_left=0, bottom_right=2 - ), - ), - 40: tileset.Tile( - id=40, - terrain=tileset.TileTerrain( - top_left=0, top_right=2, bottom_left=0, bottom_right=0 - ), - ), - 41: tileset.Tile( - id=41, - terrain=tileset.TileTerrain( - top_left=2, top_right=2, bottom_left=0, bottom_right=0 - ), - ), - 42: tileset.Tile( - id=42, - terrain=tileset.TileTerrain( - top_left=2, top_right=0, bottom_left=0, bottom_right=0 - ), - ), - 43: tileset.Tile( - id=43, - terrain=tileset.TileTerrain( - top_left=2, top_right=0, bottom_left=2, bottom_right=2 - ), - ), - 44: tileset.Tile( - id=44, - terrain=tileset.TileTerrain( - top_left=0, top_right=2, bottom_left=2, bottom_right=2 - ), - ), - }, ) diff --git a/tests/test_data/tilesets/terrain/tileset.json b/tests/test_data/tilesets/terrain/tileset.json index 4bd9d32..e43b4fb 100644 --- a/tests/test_data/tilesets/terrain/tileset.json +++ b/tests/test_data/tilesets/terrain/tileset.json @@ -1,206 +1,206 @@ { "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, "name":"tileset", "spacing":1, - "terrains":[ - { - "name":"Sand", - "properties":[ - { - "name":"terrain property", - "type":"string", - "value":"test terrain property" - }], - "tile":29 - }, - { - "name":"Cobblestone", - "tile":29 - }, - { - "name":"Pavement", - "tile":29 - }, - { - "name":"Dirt", - "tile":29 - }], "tilecount":48, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, - "tiles":[ - { - "id":0, - "terrain":[0, 0, 0, 1] - }, - { - "id":1, - "terrain":[0, 0, 1, 1] - }, - { - "id":2, - "terrain":[0, 0, 1, 0] - }, - { - "id":3, - "terrain":[3, 3, 3, 0] - }, - { - "id":4, - "terrain":[3, 3, 0, 3] - }, - { - "id":5, - "terrain":[0, 0, 0, 3] - }, - { - "id":6, - "terrain":[0, 0, 3, 3] - }, - { - "id":7, - "terrain":[0, 0, 3, 0] - }, - { - "id":8, - "terrain":[0, 1, 0, 1] - }, - { - "id":9, - "terrain":[1, 1, 1, 1] - }, - { - "id":10, - "terrain":[1, 0, 1, 0] - }, - { - "id":11, - "terrain":[3, 0, 3, 3] - }, - { - "id":12, - "terrain":[0, 3, 3, 3] - }, - { - "id":13, - "terrain":[0, 3, 0, 3] - }, - { - "id":14, - "terrain":[3, 3, 3, 3] - }, - { - "id":15, - "terrain":[3, 0, 3, 0] - }, - { - "id":16, - "terrain":[0, 1, 0, 0] - }, - { - "id":17, - "terrain":[1, 1, 0, 0] - }, - { - "id":18, - "terrain":[1, 0, 0, 0] - }, - { - "id":19, - "terrain":[1, 1, 1, 0] - }, - { - "id":20, - "terrain":[1, 1, 0, 1] - }, - { - "id":21, - "terrain":[0, 3, 0, 0] - }, - { - "id":22, - "terrain":[3, 3, 0, 0] - }, - { - "id":23, - "terrain":[3, 0, 0, 0] - }, - { - "id":24, - "terrain":[0, 0, 0, 2] - }, - { - "id":25, - "terrain":[0, 0, 2, 2] - }, - { - "id":26, - "terrain":[0, 0, 2, 0] - }, - { - "id":27, - "terrain":[1, 0, 1, 1] - }, - { - "id":28, - "terrain":[0, 1, 1, 1] - }, - { - "id":29, - "terrain":[0, 0, 0, 0] - }, - { - "id":32, - "terrain":[0, 2, 0, 2] - }, - { - "id":33, - "terrain":[2, 2, 2, 2] - }, - { - "id":34, - "terrain":[2, 0, 2, 0] - }, - { - "id":35, - "terrain":[2, 2, 2, 0] - }, - { - "id":36, - "terrain":[2, 2, 0, 2] - }, - { - "id":40, - "terrain":[0, 2, 0, 0] - }, - { - "id":41, - "terrain":[2, 2, 0, 0] - }, - { - "id":42, - "terrain":[2, 0, 0, 0] - }, - { - "id":43, - "terrain":[2, 0, 2, 2] - }, - { - "id":44, - "terrain":[0, 2, 2, 2] - }], "tilewidth":32, "type":"tileset", - "version":1.2 + "version":"1.6", + "wangsets":[ + { + "colors":[ + { + "color":"#ff0000", + "name":"Sand", + "probability":1, + "tile":-1 + }, + { + "color":"#00ff00", + "name":"Cobblestone", + "probability":1, + "tile":-1 + }, + { + "color":"#0000ff", + "name":"Pavement", + "probability":1, + "tile":-1 + }, + { + "color":"#ff7700", + "name":"Dirt", + "probability":1, + "tile":-1 + }], + "name":"Terrains", + "tile":-1, + "type":"mixed", + "wangtiles":[ + { + "tileid":0, + "wangid":[1, 1, 0, 2, 0, 1, 1, 1] + }, + { + "tileid":1, + "wangid":[1, 1, 0, 2, 2, 2, 0, 1] + }, + { + "tileid":2, + "wangid":[1, 1, 1, 1, 0, 2, 0, 1] + }, + { + "tileid":3, + "wangid":[4, 4, 0, 1, 0, 4, 4, 4] + }, + { + "tileid":4, + "wangid":[4, 4, 4, 4, 0, 1, 0, 4] + }, + { + "tileid":5, + "wangid":[1, 1, 0, 4, 0, 1, 1, 1] + }, + { + "tileid":6, + "wangid":[1, 1, 0, 4, 4, 4, 0, 1] + }, + { + "tileid":7, + "wangid":[1, 1, 1, 1, 0, 4, 0, 1] + }, + { + "tileid":8, + "wangid":[0, 2, 2, 2, 0, 1, 1, 1] + }, + { + "tileid":9, + "wangid":[2, 2, 2, 2, 2, 2, 2, 2] + }, + { + "tileid":10, + "wangid":[0, 1, 1, 1, 0, 2, 2, 2] + }, + { + "tileid":11, + "wangid":[0, 1, 0, 4, 4, 4, 4, 4] + }, + { + "tileid":12, + "wangid":[0, 4, 4, 4, 4, 4, 0, 1] + }, + { + "tileid":13, + "wangid":[0, 4, 4, 4, 0, 1, 1, 1] + }, + { + "tileid":14, + "wangid":[4, 4, 4, 4, 4, 4, 4, 4] + }, + { + "tileid":15, + "wangid":[0, 1, 1, 1, 0, 4, 4, 4] + }, + { + "tileid":16, + "wangid":[0, 2, 0, 1, 1, 1, 1, 1] + }, + { + "tileid":17, + "wangid":[2, 2, 0, 1, 1, 1, 0, 2] + }, + { + "tileid":18, + "wangid":[0, 1, 1, 1, 1, 1, 0, 2] + }, + { + "tileid":19, + "wangid":[2, 2, 0, 1, 0, 2, 2, 2] + }, + { + "tileid":20, + "wangid":[2, 2, 2, 2, 0, 1, 0, 2] + }, + { + "tileid":21, + "wangid":[0, 4, 0, 1, 1, 1, 1, 1] + }, + { + "tileid":22, + "wangid":[4, 4, 0, 1, 1, 1, 0, 4] + }, + { + "tileid":23, + "wangid":[0, 1, 1, 1, 1, 1, 0, 4] + }, + { + "tileid":24, + "wangid":[1, 1, 0, 3, 0, 1, 1, 1] + }, + { + "tileid":25, + "wangid":[1, 1, 0, 3, 3, 3, 0, 1] + }, + { + "tileid":26, + "wangid":[1, 1, 1, 1, 0, 3, 0, 1] + }, + { + "tileid":27, + "wangid":[0, 1, 0, 2, 2, 2, 2, 2] + }, + { + "tileid":28, + "wangid":[0, 2, 2, 2, 2, 2, 0, 1] + }, + { + "tileid":29, + "wangid":[1, 1, 1, 1, 1, 1, 1, 1] + }, + { + "tileid":32, + "wangid":[0, 3, 3, 3, 0, 1, 1, 1] + }, + { + "tileid":33, + "wangid":[3, 3, 3, 3, 3, 3, 3, 3] + }, + { + "tileid":34, + "wangid":[0, 1, 1, 1, 0, 3, 3, 3] + }, + { + "tileid":35, + "wangid":[3, 3, 0, 1, 0, 3, 3, 3] + }, + { + "tileid":36, + "wangid":[3, 3, 3, 3, 0, 1, 0, 3] + }, + { + "tileid":40, + "wangid":[0, 3, 0, 1, 1, 1, 1, 1] + }, + { + "tileid":41, + "wangid":[3, 3, 0, 1, 1, 1, 0, 3] + }, + { + "tileid":42, + "wangid":[0, 1, 1, 1, 1, 1, 0, 3] + }, + { + "tileid":43, + "wangid":[0, 1, 0, 3, 3, 3, 3, 3] + }, + { + "tileid":44, + "wangid":[0, 3, 3, 3, 3, 3, 0, 1] + }] + }] } \ No newline at end of file diff --git a/tests/test_data/tilesets/wangsets/map.json b/tests/test_data/tilesets/wangsets/map.json index d2fe741..6a7ee27 100644 --- a/tests/test_data/tilesets/wangsets/map.json +++ b/tests/test_data/tilesets/wangsets/map.json @@ -18,7 +18,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilesets":[ { @@ -27,6 +27,6 @@ }], "tilewidth":32, "type":"map", - "version":1.2, + "version":"1.6", "width":20 } \ No newline at end of file diff --git a/tests/test_data/tilesets/wangsets/tileset.json b/tests/test_data/tilesets/wangsets/tileset.json index 76ab027..461197b 100644 --- a/tests/test_data/tilesets/wangsets/tileset.json +++ b/tests/test_data/tilesets/wangsets/tileset.json @@ -6,15 +6,14 @@ "name":"tileset", "spacing":0, "tilecount":81, - "tiledversion":"1.3.5", + "tiledversion":"1.6.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":1.2, + "version":"1.6", "wangsets":[ { - "cornercolors":[], - "edgecolors":[ + "colors":[ { "color":"#ff0000", "name":"Path", @@ -35,572 +34,330 @@ }], "name":"My Wang Set", "tile":-1, + "type":"edge", "wangtiles":[ { - "dflip":false, - "hflip":false, "tileid":0, - "vflip":false, "wangid":[2, 0, 3, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":1, - "vflip":false, "wangid":[2, 0, 3, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":2, - "vflip":false, "wangid":[2, 0, 1, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":3, - "vflip":false, "wangid":[2, 0, 3, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":4, - "vflip":false, "wangid":[2, 0, 2, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":5, - "vflip":false, "wangid":[2, 0, 1, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":6, - "vflip":false, "wangid":[2, 0, 1, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":7, - "vflip":false, "wangid":[2, 0, 2, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":8, - "vflip":false, "wangid":[2, 0, 2, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":9, - "vflip":false, "wangid":[3, 0, 3, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":10, - "vflip":false, "wangid":[3, 0, 3, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":11, - "vflip":false, "wangid":[3, 0, 1, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":12, - "vflip":false, "wangid":[3, 0, 3, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":13, - "vflip":false, "wangid":[3, 0, 2, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":14, - "vflip":false, "wangid":[3, 0, 1, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":15, - "vflip":false, "wangid":[3, 0, 1, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":16, - "vflip":false, "wangid":[3, 0, 2, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":17, - "vflip":false, "wangid":[3, 0, 2, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":18, - "vflip":false, "wangid":[3, 0, 3, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":19, - "vflip":false, "wangid":[3, 0, 3, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":20, - "vflip":false, "wangid":[3, 0, 1, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":21, - "vflip":false, "wangid":[3, 0, 3, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":22, - "vflip":false, "wangid":[3, 0, 2, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":23, - "vflip":false, "wangid":[3, 0, 1, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":24, - "vflip":false, "wangid":[3, 0, 1, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":25, - "vflip":false, "wangid":[3, 0, 2, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":26, - "vflip":false, "wangid":[3, 0, 2, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":27, - "vflip":false, "wangid":[1, 0, 3, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":28, - "vflip":false, "wangid":[1, 0, 3, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":29, - "vflip":false, "wangid":[1, 0, 1, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":30, - "vflip":false, "wangid":[1, 0, 3, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":31, - "vflip":false, "wangid":[1, 0, 2, 0, 3, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":32, - "vflip":false, "wangid":[1, 0, 1, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":33, - "vflip":false, "wangid":[1, 0, 1, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":34, - "vflip":false, "wangid":[1, 0, 2, 0, 3, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":35, - "vflip":false, "wangid":[1, 0, 2, 0, 3, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":36, - "vflip":false, "wangid":[3, 0, 3, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":37, - "vflip":false, "wangid":[3, 0, 3, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":38, - "vflip":false, "wangid":[3, 0, 1, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":39, - "vflip":false, "wangid":[3, 0, 3, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":40, - "vflip":false, "wangid":[3, 0, 2, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":41, - "vflip":false, "wangid":[3, 0, 1, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":42, - "vflip":false, "wangid":[3, 0, 1, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":43, - "vflip":false, "wangid":[3, 0, 2, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":44, - "vflip":false, "wangid":[3, 0, 2, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":45, - "vflip":false, "wangid":[2, 0, 3, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":46, - "vflip":false, "wangid":[2, 0, 3, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":47, - "vflip":false, "wangid":[2, 0, 1, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":48, - "vflip":false, "wangid":[2, 0, 3, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":49, - "vflip":false, "wangid":[2, 0, 2, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":50, - "vflip":false, "wangid":[2, 0, 1, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":51, - "vflip":false, "wangid":[2, 0, 1, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":52, - "vflip":false, "wangid":[2, 0, 2, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":53, - "vflip":false, "wangid":[2, 0, 2, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":54, - "vflip":false, "wangid":[1, 0, 3, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":55, - "vflip":false, "wangid":[1, 0, 3, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":56, - "vflip":false, "wangid":[1, 0, 1, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":57, - "vflip":false, "wangid":[1, 0, 3, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":58, - "vflip":false, "wangid":[1, 0, 2, 0, 1, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":59, - "vflip":false, "wangid":[1, 0, 1, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":60, - "vflip":false, "wangid":[1, 0, 1, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":61, - "vflip":false, "wangid":[1, 0, 2, 0, 1, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":62, - "vflip":false, "wangid":[1, 0, 2, 0, 1, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":63, - "vflip":false, "wangid":[1, 0, 3, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":64, - "vflip":false, "wangid":[1, 0, 3, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":65, - "vflip":false, "wangid":[1, 0, 1, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":66, - "vflip":false, "wangid":[1, 0, 3, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":67, - "vflip":false, "wangid":[1, 0, 2, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":68, - "vflip":false, "wangid":[1, 0, 1, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":69, - "vflip":false, "wangid":[1, 0, 1, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":70, - "vflip":false, "wangid":[1, 0, 2, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":71, - "vflip":false, "wangid":[1, 0, 2, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":72, - "vflip":false, "wangid":[2, 0, 3, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":73, - "vflip":false, "wangid":[2, 0, 3, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":74, - "vflip":false, "wangid":[2, 0, 1, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":75, - "vflip":false, "wangid":[2, 0, 3, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":76, - "vflip":false, "wangid":[2, 0, 2, 0, 2, 0, 3, 0] }, { - "dflip":false, - "hflip":false, "tileid":77, - "vflip":false, "wangid":[2, 0, 1, 0, 2, 0, 2, 0] }, { - "dflip":false, - "hflip":false, "tileid":78, - "vflip":false, "wangid":[2, 0, 1, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":79, - "vflip":false, "wangid":[2, 0, 2, 0, 2, 0, 1, 0] }, { - "dflip":false, - "hflip":false, "tileid":80, - "vflip":false, "wangid":[2, 0, 2, 0, 2, 0, 2, 0] }] }]